From 6588049025c8711390b9a6f3fabea81c22aa30cc Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Thu, 28 Feb 2019 15:15:51 -0300 Subject: [PATCH] fix(NLP): Update of platform to mach NLP URL updates and versioning. --- package-lock.json | 484 ++++-------------- package.json | 40 +- .../dialogs/StartDialog.ts | 3 + .../services/GBConversationalService.ts | 6 +- packages/core.gbapp/services/GBCoreService.ts | 1 + packages/core.gbapp/services/GBMinService.ts | 15 +- packages/kb.gbapp/dialogs/AskDialog.ts | 2 + 7 files changed, 144 insertions(+), 407 deletions(-) diff --git a/package-lock.json b/package-lock.json index 806acdfa..9e5a51be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -981,14 +981,6 @@ } } }, - "@kyleshockey/js-yaml": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@kyleshockey/js-yaml/-/js-yaml-1.0.1.tgz", - "integrity": "sha512-coFyIk1LvTscq1cUU4nCCfYwv+cmG4fCP+wgDKgYZjhM4f++YwZy+g0k+1tUqa4GuUpBTEOGH2KUqKFFWdT73g==", - "requires": { - "argparse": "^1.0.7" - } - }, "@kyleshockey/object-assign-deep": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/@kyleshockey/object-assign-deep/-/object-assign-deep-0.4.2.tgz", @@ -1523,25 +1515,11 @@ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" }, - "@types/async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/@types/async/-/async-2.4.1.tgz", - "integrity": "sha512-C09BK/wXzbW+/JK9zckhe+FeSbg7NmvVjUWwApnw7ksRpUq3ecGLiq2Aw1LlY4Z/VmtdhSaIs7jO5/MWRYMcOA==" - }, "@types/bluebird": { "version": "3.5.18", "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.18.tgz", "integrity": "sha512-OTPWHmsyW18BhrnG5x8F7PzeZ2nFxmHGb42bZn79P9hl+GI5cMzyPgQTwNjbem0lJhoru/8vtjAFCUOu3+gE2w==" }, - "@types/body-parser": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz", - "integrity": "sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==", - "requires": { - "@types/connect": "*", - "@types/node": "*" - } - }, "@types/caseless": { "version": "0.12.1", "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz", @@ -1553,14 +1531,6 @@ "integrity": "sha512-2Y8uPt0/jwjhQ6EiluT0XCri1Dbplr0ZxfFXUz+ye13gaqE8u5gL5ppao1JrUYr9cIip5S6MvQzBS7Kke7U9VA==", "dev": true }, - "@types/connect": { - "version": "3.4.32", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz", - "integrity": "sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==", - "requires": { - "@types/node": "*" - } - }, "@types/continuation-local-storage": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/@types/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz", @@ -1582,25 +1552,6 @@ "resolved": "http://registry.npmjs.org/@types/events/-/events-1.2.0.tgz", "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==" }, - "@types/express": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.16.1.tgz", - "integrity": "sha512-V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg==", - "requires": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "*", - "@types/serve-static": "*" - } - }, - "@types/express-serve-static-core": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.1.tgz", - "integrity": "sha512-QgbIMRU1EVRry5cIu1ORCQP4flSYqLM1lS5LYyGWfKnFT3E58f0gKto7BR13clBFVrVZ0G0rbLZ1hUpSkgQQOA==", - "requires": { - "@types/node": "*", - "@types/range-parser": "*" - } - }, "@types/filenamify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/filenamify/-/filenamify-2.0.1.tgz", @@ -1678,11 +1629,6 @@ "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.4.2.tgz", "integrity": "sha512-cDB930/7MbzaGF6U3IwSQp6XBru8xWajF5PV2YZZeV8DyiliTuld11afVztGI9+yJZ29il5E+NpGA6ooV/Cjkg==" }, - "@types/mime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz", - "integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==" - }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -1706,11 +1652,6 @@ "@types/node": "*" } }, - "@types/range-parser": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", - "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==" - }, "@types/request": { "version": "2.47.1", "resolved": "https://registry.npmjs.org/@types/request/-/request-2.47.1.tgz", @@ -1736,9 +1677,9 @@ "integrity": "sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==" }, "@types/sequelize": { - "version": "4.27.37", - "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.27.37.tgz", - "integrity": "sha512-o1bnbLaw/tPf0QsrLyXB1JwnMvK7gNR29bgCjNlk0fnYyHHk9M7jrnevqjM8tkd5uJVx5bRj09Bxm4ynrYyCkQ==", + "version": "4.27.38", + "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.27.38.tgz", + "integrity": "sha512-HR+epHzmU8xSMRUjhuuYKHn3IxD2Ft4OePEqXY8/6otDyPn9s6SZx4bVLnUa98jv6Ny0Di9IHQHOXh35O7QajQ==", "dev": true, "requires": { "@types/bluebird": "*", @@ -1747,15 +1688,6 @@ "@types/validator": "*" } }, - "@types/serve-static": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.2.tgz", - "integrity": "sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==", - "requires": { - "@types/express-serve-static-core": "*", - "@types/mime": "*" - } - }, "@types/shelljs": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.2.tgz", @@ -1765,11 +1697,6 @@ "@types/node": "*" } }, - "@types/sprintf-js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.2.tgz", - "integrity": "sha512-hkgzYF+qnIl8uTO8rmUSVSfQ8BIfMXC4yJAF4n8BE758YsKBZvFC4NumnAegj7KmylP0liEZNpb9RRGFMbFejA==" - }, "@types/tough-cookie": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.3.tgz", @@ -2205,7 +2132,8 @@ "asap": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", + "dev": true }, "asn1": { "version": "0.2.4", @@ -2703,15 +2631,15 @@ } }, "botbuilder": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.2.1.tgz", - "integrity": "sha512-58664aLhN1WQwAxMBK7LZQhFh8DHwenvpgz6ADFgeZLZS28NACfX+Uta8k2+WF6RK3g+VKoGOhV/yI71c5ccVg==", + "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.2.1", - "botframework-connector": "^4.2.1", + "botbuilder-core": "^4.1.7", + "botframework-connector": "^4.1.7", "filenamify": "^2.0.0", "rimraf": "^2.6.2" }, @@ -2724,16 +2652,16 @@ } }, "botbuilder-ai": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/botbuilder-ai/-/botbuilder-ai-4.2.1.tgz", - "integrity": "sha512-gej7KR0iFIK38M4eIkGFOn+Tk7sMpzGTJgMVy/ctz21m6vQDGfqFLjJzDk4GRG9oLaZfq5bqUw5sLtepLAZcUg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/botbuilder-ai/-/botbuilder-ai-4.2.0.tgz", + "integrity": "sha512-dt2OydZ9pWyMSNgha3PlC6lBq3sXUXAYmadqogNqvWpYEmIMdBOCUc02Vn2w1suxLX84GdYqdBI2klwrRZ7oKg==", "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.2.1", + "botbuilder": "^4.2.0", "html-entities": "^1.2.1", "moment": "^2.20.1", "ms-rest": "^2.3.6", @@ -2747,6 +2675,20 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.42.tgz", "integrity": "sha512-SpeVQJFekfnEaZZO1yl4je/36upII36L7gOT4DBx51B1GeAB45mmDb3a5OBQB+ZeFxVVOP37r8Owsl940G/fBg==" }, + "botbuilder": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.2.1.tgz", + "integrity": "sha512-58664aLhN1WQwAxMBK7LZQhFh8DHwenvpgz6ADFgeZLZS28NACfX+Uta8k2+WF6RK3g+VKoGOhV/yI71c5ccVg==", + "requires": { + "@types/filenamify": "^2.0.1", + "@types/node": "^9.3.0", + "async-file": "^2.0.2", + "botbuilder-core": "^4.2.1", + "botframework-connector": "^4.2.1", + "filenamify": "^2.0.0", + "rimraf": "^2.6.2" + } + }, "request-promise-native": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz", @@ -2760,13 +2702,13 @@ } }, "botbuilder-azure": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/botbuilder-azure/-/botbuilder-azure-4.2.1.tgz", - "integrity": "sha512-YbdIF3Xp3m1Ei3EnPY3YyPPrH/u10pBplMTluPnc1Qptd1z5mRtuG02kLsG22SivQN7rhyA8WNSgHlAjXShpeg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/botbuilder-azure/-/botbuilder-azure-4.2.0.tgz", + "integrity": "sha512-WL8dHtVESE/qTFTGcJwlFeKyUeewoyoNr5ENavu1W40N8UjZB32ivmX2dvd0Zm4TIbeBwgmomF2gE9rE+0Rv3w==", "requires": { "@types/node": "^9.3.0", "azure-storage": "^2.10.2", - "botbuilder": "^4.2.1", + "botbuilder": "^4.2.0", "documentdb": "1.14.5", "flat": "^4.0.0", "semaphore": "^1.1.0" @@ -2776,6 +2718,20 @@ "version": "9.6.42", "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.42.tgz", "integrity": "sha512-SpeVQJFekfnEaZZO1yl4je/36upII36L7gOT4DBx51B1GeAB45mmDb3a5OBQB+ZeFxVVOP37r8Owsl940G/fBg==" + }, + "botbuilder": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.2.1.tgz", + "integrity": "sha512-58664aLhN1WQwAxMBK7LZQhFh8DHwenvpgz6ADFgeZLZS28NACfX+Uta8k2+WF6RK3g+VKoGOhV/yI71c5ccVg==", + "requires": { + "@types/filenamify": "^2.0.1", + "@types/node": "^9.3.0", + "async-file": "^2.0.2", + "botbuilder-core": "^4.2.1", + "botframework-connector": "^4.2.1", + "filenamify": "^2.0.0", + "rimraf": "^2.6.2" + } } } }, @@ -2944,16 +2900,16 @@ } }, "botbuilder-dialogs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/botbuilder-dialogs/-/botbuilder-dialogs-4.2.1.tgz", - "integrity": "sha512-QHD9WigzC7rOJT0hb9Xzs/yHs1g/MOabJey8qxlZPdnnQqK5X8KJaZEEDnRqcUmLj/ydbxnxqImLEsMD5zlGag==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/botbuilder-dialogs/-/botbuilder-dialogs-4.2.0.tgz", + "integrity": "sha512-wi7Vk/mRHqsjNVhCbXK6yoYsQ7uS7EySM+bcDRthw5uDQ9LyHHoRg3wzT+mqbfjzwgpKR/TXxPUDM4nDL8Hz+Q==", "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.2.1" + "botbuilder-core": "^4.2.0" }, "dependencies": { "@microsoft/recognizers-text-choice": { @@ -2997,124 +2953,6 @@ } } }, - "botbuilder-location": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/botbuilder-location/-/botbuilder-location-2.0.0.tgz", - "integrity": "sha1-EQnJAtB4Gtr8zYKsMtOxSSvCPGo=", - "requires": { - "botbuilder": "^3.5.3", - "request-promise": "^4.1.1", - "sprintf-js": "^1.0.3" - }, - "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.42", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.42.tgz", - "integrity": "sha512-SpeVQJFekfnEaZZO1yl4je/36upII36L7gOT4DBx51B1GeAB45mmDb3a5OBQB+ZeFxVVOP37r8Owsl940G/fBg==" - }, - "@types/url-join": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/@types/url-join/-/url-join-0.8.3.tgz", - "integrity": "sha512-bM7dzLHuCqDNlbeOxvo/KfweN3La4d9C1VFGCgefxiZXn0JcRtyGDwWCSUEO8RrMhnx/LGhDOXP8TTokM1grSA==" - }, - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" - }, - "base64url": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz", - "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==" - }, - "botbuilder": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-3.16.0.tgz", - "integrity": "sha512-Gf51aNfvBuAxKSXQ+1SV/P1lzuRMyMyIqvjUUSqpjbtW6lFkPHhCmJIM0Dgxbflq78EXXisIYZQgAqsUNYeVQQ==", - "requires": { - "@types/async": "^2.0.48", - "@types/express": "^4.11.1", - "@types/form-data": "^2.2.1", - "@types/jsonwebtoken": "^7.2.6", - "@types/node": "^9.6.1", - "@types/request": "^2.47.0", - "@types/sprintf-js": "^1.1.0", - "@types/url-join": "^0.8.1", - "async": "^1.5.2", - "base64url": "^3.0.0", - "chrono-node": "^1.1.3", - "jsonwebtoken": "^8.2.2", - "promise": "^7.1.1", - "request": "^2.88.0", - "rsa-pem-from-mod-exp": "^0.8.4", - "sprintf-js": "^1.0.3", - "url-join": "^1.1.0" - } - }, - "ecdsa-sig-formatter": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", - "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "jsonwebtoken": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.0.tgz", - "integrity": "sha512-IqEycp0znWHNA11TpYi77bVgyBO/pGESDh7Ajhas+u0ttkGkKYIIAjniL4Bw5+oVejVF+SYkaI7XKfwCCyeTuA==", - "requires": { - "jws": "^3.2.1", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", - "ms": "^2.1.1", - "semver": "^5.6.0" - } - }, - "jwa": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.3.0.tgz", - "integrity": "sha512-SxObIyzv9a6MYuZYaSN6DhSm9j3+qkokwvCB0/OTSV5ylPq1wUQiygZQcHT5Qlux0I5kmISx3J86TxKhuefItg==", - "requires": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "jws": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.1.tgz", - "integrity": "sha512-bGA2omSrFUkd72dhh05bIAN832znP4wOU3lfuXtRBuGTbsmNmDXMQg28f0Vsxaxgk4myF5YkKQpz6qeRpMgX9g==", - "requires": { - "jwa": "^1.2.0", - "safe-buffer": "^5.0.1" - } - }, - "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" - }, - "url-join": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/url-join/-/url-join-1.1.0.tgz", - "integrity": "sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg=" - } - } - }, "botbuilder-prompts": { "version": "4.0.0-preview1.2", "resolved": "https://registry.npmjs.org/botbuilder-prompts/-/botbuilder-prompts-4.0.0-preview1.2.tgz", @@ -3328,17 +3166,16 @@ } }, "botlib": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/botlib/-/botlib-0.1.12.tgz", - "integrity": "sha512-odBPlEBeYHSEfDfiTDknIp+/NM6Ar1q1TShXZ7xwc/+0CD90Y3dyjlVZDwiZtG2vfk5btiB8GjLzgP4v1nYE6A==", + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/botlib/-/botlib-0.1.19.tgz", + "integrity": "sha512-JssUqK0NVwLTvs2zcl42jpKTsB5ocse27aVnFukV+wGuAjCeZu6HZpaTue1jTCHojMXAH1TSLNQnuCOOTxpw/w==", "requires": { "async": "2.6.2", - "botbuilder": "4.2.1", - "botbuilder-ai": "4.2.1", - "botbuilder-azure": "4.2.1", + "botbuilder": "4.1.7", + "botbuilder-ai": "4.2.0", + "botbuilder-azure": "4.2.0", "botbuilder-choices": "4.0.0-preview1.2", - "botbuilder-dialogs": "4.2.1", - "botbuilder-location": "2.0.0", + "botbuilder-dialogs": "4.2.0", "botbuilder-prompts": "4.0.0-preview1.2", "chrono-node": "1.3.11", "dotenv-extended": "2.3.0", @@ -3346,118 +3183,12 @@ "ms": "2.1.1", "pragmatismo-io-framework": "1.0.19", "reflect-metadata": "0.1.13", - "sequelize": "4.42.0", + "sequelize": "4.42.1", "sequelize-typescript": "0.6.7", "wait-until": "0.0.2", "winston": "3.2.1" }, "dependencies": { - "@microsoft/recognizers-text-choice": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-choice/-/recognizers-text-choice-1.1.2.tgz", - "integrity": "sha512-4hFdqxusM0YrOXYM2RVYPl2rLjItSh6VkRiACjWB95GKC/DBGjJRYQpTxhzuZAsJSkDMinu/aLf8DvQtwUaLtA==", - "requires": { - "@microsoft/recognizers-text": "~1.1.2", - "grapheme-splitter": "^1.0.2" - } - }, - "@microsoft/recognizers-text-number": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-number/-/recognizers-text-number-1.1.2.tgz", - "integrity": "sha512-GESjSF42dllym83diyd6pmlzFwdzidewoq/qSQz89lSoTx9HdJQHjbXxwdBp7w4Ax/Jroo2lcAedM3B7alZhYQ==", - "requires": { - "@microsoft/recognizers-text": "~1.1.2", - "bignumber.js": "^7.2.1", - "lodash.escaperegexp": "^4.1.2", - "lodash.sortby": "^4.7.0", - "lodash.trimend": "^4.5.1" - } - }, - "@microsoft/recognizers-text-suite": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-suite/-/recognizers-text-suite-1.1.2.tgz", - "integrity": "sha512-w3WCsKa//64jE1fGPFlV02rRg9+b3oDp+K5/skPAn4KDr80LjXxD1ulIgiJ2Ll/2OoBl8ociCiCjYA7zS3LpdQ==", - "requires": { - "@microsoft/recognizers-text": "~1.1.2", - "@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-number-with-unit": "~1.1.2", - "@microsoft/recognizers-text-sequence": "~1.1.2" - } - }, - "@types/node": { - "version": "9.6.42", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.42.tgz", - "integrity": "sha512-SpeVQJFekfnEaZZO1yl4je/36upII36L7gOT4DBx51B1GeAB45mmDb3a5OBQB+ZeFxVVOP37r8Owsl940G/fBg==" - }, - "async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", - "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", - "requires": { - "lodash": "^4.17.11" - } - }, - "botbuilder": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.2.1.tgz", - "integrity": "sha512-58664aLhN1WQwAxMBK7LZQhFh8DHwenvpgz6ADFgeZLZS28NACfX+Uta8k2+WF6RK3g+VKoGOhV/yI71c5ccVg==", - "requires": { - "@types/filenamify": "^2.0.1", - "@types/node": "^9.3.0", - "async-file": "^2.0.2", - "botbuilder-core": "^4.2.1", - "botframework-connector": "^4.2.1", - "filenamify": "^2.0.0", - "rimraf": "^2.6.2" - } - }, - "botbuilder-ai": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/botbuilder-ai/-/botbuilder-ai-4.2.1.tgz", - "integrity": "sha512-gej7KR0iFIK38M4eIkGFOn+Tk7sMpzGTJgMVy/ctz21m6vQDGfqFLjJzDk4GRG9oLaZfq5bqUw5sLtepLAZcUg==", - "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.2.1", - "html-entities": "^1.2.1", - "moment": "^2.20.1", - "ms-rest": "^2.3.6", - "mstranslator": "^3.0.0", - "request": "^2.87.0", - "request-promise-native": "1.0.5" - } - }, - "botbuilder-azure": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/botbuilder-azure/-/botbuilder-azure-4.2.1.tgz", - "integrity": "sha512-YbdIF3Xp3m1Ei3EnPY3YyPPrH/u10pBplMTluPnc1Qptd1z5mRtuG02kLsG22SivQN7rhyA8WNSgHlAjXShpeg==", - "requires": { - "@types/node": "^9.3.0", - "azure-storage": "^2.10.2", - "botbuilder": "^4.2.1", - "documentdb": "1.14.5", - "flat": "^4.0.0", - "semaphore": "^1.1.0" - } - }, - "botbuilder-dialogs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/botbuilder-dialogs/-/botbuilder-dialogs-4.2.1.tgz", - "integrity": "sha512-QHD9WigzC7rOJT0hb9Xzs/yHs1g/MOabJey8qxlZPdnnQqK5X8KJaZEEDnRqcUmLj/ydbxnxqImLEsMD5zlGag==", - "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.2.1" - } - }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -3465,21 +3196,6 @@ "requires": { "safer-buffer": ">= 2.1.2 < 3" } - }, - "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" - }, - "request-promise-native": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz", - "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=", - "requires": { - "request-promise-core": "1.1.1", - "stealthy-require": "^1.1.0", - "tough-cookie": ">=2.3.3" - } } } }, @@ -4343,9 +4059,9 @@ } }, "commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", + "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==", "dev": true }, "commitizen": { @@ -7183,9 +6899,9 @@ } }, "generic-pool": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.4.2.tgz", - "integrity": "sha512-H7cUpwCQSiJmAHM4c/aFu6fUfrhWXW1ncyh8ftxEPMu6AiYkHw9K8br720TGPZJbk5eOH2bynjZD1yPvdDAmag==" + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.5.0.tgz", + "integrity": "sha512-dEkxmX+egB2o4NR80c/q+xzLLzLX+k68/K8xv81XprD+Sk7ZtP14VugeCz+fUwv5FzpWq40pPtAkzPRqT8ka9w==" }, "get-caller-file": { "version": "1.0.3", @@ -9514,9 +9230,9 @@ "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=" }, "mocha": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.0.1.tgz", - "integrity": "sha512-tQzCxWqxSD6Oyg5r7Ptbev0yAMD8p+Vfh4snPFuiUsWqYj0eVYTDT2DkEY307FTj0WRlIWN9rWMMAUzRmijgVQ==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.0.2.tgz", + "integrity": "sha512-RtTJsmmToGyeTznSOMoM6TPEk1A84FQaHIciKrRqARZx+B5ccJ5tXlmJzEKGBxZdqk9UjpRsesZTUkZmR5YnuQ==", "requires": { "ansi-colors": "3.2.3", "browser-stdout": "1.3.1", @@ -13415,9 +13131,9 @@ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "nwsapi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.0.tgz", - "integrity": "sha512-ZG3bLAvdHmhIjaQ/Db1qvBxsGvFMLIRpQszyqbg31VJ53UP++uZX1/gf3Ut96pdwN9AuDwlMqIYLm0UPCdUeHg==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.1.tgz", + "integrity": "sha512-T5GaA1J/d34AC8mkrFD2O0DR17kwJ702ZOtJOsS8RpbsQZVOC2/xYFb1i/cw+xdM54JIlMuojjDOYct8GIWtwg==" }, "nyc": { "version": "13.3.0", @@ -15090,14 +14806,6 @@ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz", "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=" }, - "promise": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", - "requires": { - "asap": "~2.0.3" - } - }, "prop-types": { "version": "15.6.2", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz", @@ -16315,16 +16023,16 @@ } }, "sequelize": { - "version": "4.42.0", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.42.0.tgz", - "integrity": "sha512-qxAYnX4rcv7PbNtEidb56REpxNJCdbN0qyk1jb3+e6sE7OrmS0nYMU+MFVbNTJtZfSpOEEL1TX0TkMw+wzZBxg==", + "version": "4.42.1", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.42.1.tgz", + "integrity": "sha512-W9i/CkBjCHLzEkJQkaxXaK82MA16b7F74PjtE7EUR+d7WU/X3U+YU5givWR+/VRXay1VXDyBOfXgw9/zdhDSDg==", "requires": { "bluebird": "^3.5.0", "cls-bluebird": "^2.1.0", "debug": "^3.1.0", "depd": "^1.1.0", "dottie": "^2.0.0", - "generic-pool": "^3.4.0", + "generic-pool": "3.5.0", "inflection": "1.12.0", "lodash": "^4.17.1", "moment": "^2.20.0", @@ -16449,9 +16157,9 @@ } }, "shimmer": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.0.tgz", - "integrity": "sha512-xTCx2vohXC2EWWDqY/zb4+5Mu28D+HYNSOuFzsyRDRvI/e1ICb69afwaUwfjr+25ZXldbOLyp+iDUZHq8UnTag==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz", + "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==" }, "shx": { "version": "0.3.2", @@ -17368,9 +17076,9 @@ } }, "swagger-client": { - "version": "3.8.24", - "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.8.24.tgz", - "integrity": "sha512-XFPOEz+IUPqIlYne2VAglYqqFBUykQvcVtfWbaE3BEu1xjAvCk1G873vj3NVQ0qR+2P1xq4VYMLCHqfqNGsLRA==", + "version": "3.8.25", + "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.8.25.tgz", + "integrity": "sha512-7ZtSSPnempsUbCAOJCQ6PyGaNkRoCm6ghOpJlI62ChfMGbLWtlOm8dLlgYiTkP9OAWuNHoRoTzOW14+QmZY1HA==", "requires": { "@kyleshockey/js-yaml": "^1.0.1", "@kyleshockey/object-assign-deep": "^0.4.0", @@ -17391,6 +17099,14 @@ "utfstring": "^2.0.0" }, "dependencies": { + "@kyleshockey/js-yaml": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@kyleshockey/js-yaml/-/js-yaml-1.0.1.tgz", + "integrity": "sha512-coFyIk1LvTscq1cUU4nCCfYwv+cmG4fCP+wgDKgYZjhM4f++YwZy+g0k+1tUqa4GuUpBTEOGH2KUqKFFWdT73g==", + "requires": { + "argparse": "^1.0.7" + } + }, "deep-extend": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", @@ -17479,6 +17195,11 @@ } } }, + "temperature-js": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/temperature-js/-/temperature-js-0.1.0.tgz", + "integrity": "sha512-j9XK8Pd+nMIYsQ0z4qL5ZlPf2/9CKPTqNN3eyG95hWHkLIbUA/AkjQPmL3MyeKuby1CwZihU2zqhmq9iRJxwJQ==" + }, "term-size": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", @@ -17906,9 +17627,9 @@ "integrity": "sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY=" }, "tslint": { - "version": "5.12.1", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.12.1.tgz", - "integrity": "sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==", + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.13.0.tgz", + "integrity": "sha512-ECOOQRxXCYnUUePG5h/+Z1Zouobk3KFpIHA9aKBB/nnMxs97S1JJPDGt5J4cGm1y9U9VmVlfboOxA8n1kSNzGw==", "dev": true, "requires": { "babel-code-frame": "^6.22.0", @@ -17919,6 +17640,7 @@ "glob": "^7.1.1", "js-yaml": "^3.7.0", "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", "resolve": "^1.3.2", "semver": "^5.3.0", "tslib": "^1.8.0", @@ -18050,9 +17772,9 @@ "integrity": "sha512-BJONvKQWolyNqnzjKQIJflsuvyjapsCPR07maHiRvUOXIbhY56SqmYs+VKevq7SIFXsnlfTEE7meP+6Y/Q2Pyw==" }, "typedoc-plugin-markdown": { - "version": "1.1.26", - "resolved": "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-1.1.26.tgz", - "integrity": "sha512-OMl3HU346gGmPpaHndjHdMWVm6zdR1iSSRgd+Q0mMT4s2f5mijkZSrCe1SFr9meZG8bPMeQo+gNUZ36pGdL6iA==", + "version": "1.1.27", + "resolved": "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-1.1.27.tgz", + "integrity": "sha512-i/ATsUETDxLAN/i4l525tLfEvjBRdPN2UEuZPEZ1CnkLIQFM1xjcIf3dFnAcIvj/qhrhrMQXfgjphqPATfTEtA==", "requires": { "turndown": "^5.0.3" } @@ -18647,9 +18369,9 @@ } }, "wkx": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.4.5.tgz", - "integrity": "sha512-01dloEcJZAJabLO5XdcRgqdKpmnxS0zIT02LhkdWOZX2Zs2tPM6hlZ4XG9tWaWur1Qd1OO4kJxUbe2+5BofvnA==", + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.4.6.tgz", + "integrity": "sha512-LHxXlzRCYQXA9ZHgs8r7Gafh0gVOE8o3QmudM1PIkOdkXXjW7Thcl+gb2P2dRuKgW8cqkitCRZkkjtmWzpHi7A==", "requires": { "@types/node": "*" } diff --git a/package.json b/package.json index 4863fb4b..c8fec51e 100644 --- a/package.json +++ b/package.json @@ -60,13 +60,13 @@ "azure-arm-website": "5.7.0", "bluebird": "^3.5.3", "body-parser": "1.18.3", - "botbuilder": "^4.2.1", - "botbuilder-ai": "^4.2.1", - "botbuilder-azure": "^4.2.1", - "botbuilder-choices": "^4.0.0-preview1.2", - "botbuilder-dialogs": "^4.2.1", - "botbuilder-prompts": "^4.0.0-preview1.2", - "botlib": "^0.1.12", + "botbuilder": "4.1.7", + "botbuilder-ai": "4.2.0", + "botbuilder-azure": "4.2.0", + "botbuilder-choices": "4.0.0-preview1.2", + "botbuilder-dialogs": "4.2.0", + "botbuilder-prompts": "4.0.0-preview1.2", + "botlib": "0.1.19", "chai": "4.2.0", "child_process": "^1.0.2", "chokidar": "2.1.2", @@ -80,32 +80,34 @@ "js-beautify": "^1.8.9", "localize": "0.4.7", "marked": "0.6.1", - "mocha": "6.0.1", + "mocha": "6.0.2", "mocha-typescript": "1.1.17", "ms": "2.1.1", "ms-rest-azure": "2.6.0", "nexmo": "2.4.1", - "ngrok": "^3.1.1", - "nyc": "^13.3.0", - "opn": "^5.4.0", + "ngrok": "3.1.1", + "nyc": "13.3.0", + "opn": "5.4.0", "pragmatismo-io-framework": "1.0.19", - "process-exists": "^3.1.0", + "process-exists": "3.1.0", "public-ip": "^3.0.0", "reflect-metadata": "0.1.13", + "request-promise": "4.2.4", "request-promise-native": "1.0.7", "scanf": "^1.0.2", - "sequelize": "4.42.0", + "sequelize": "4.42.1", "sequelize-typescript": "0.6.7", - "shx": "^0.3.2", - "simple-git": "^1.107.0", + "shx": "0.3.2", + "simple-git": "1.107.0", "sqlite3": "4.0.6", "strict-password-generator": "^1.1.2", - "swagger-client": "3.8.24", + "swagger-client": "3.8.25", "tedious": "5.0.3", + "temperature-js": "^0.1.0", "ts-node": "8.0.2", "typedoc": "0.14.2", "typedoc-plugin-external-module-name": "^2.0.0", - "typedoc-plugin-markdown": "^1.1.26", + "typedoc-plugin-markdown": "^1.1.27", "typescript": "3.3.3333", "url-join": "4.0.0", "vbscript-to-typescript": "^1.0.8", @@ -122,7 +124,7 @@ "@semantic-release/release-notes-generator": "^7.1.4", "@types/chai": "4.1.7", "@types/mocha": "5.2.6", - "@types/sequelize": "4.27.37", + "@types/sequelize": "4.27.38", "@types/url-join": "4.0.0", "@types/winston": "2.4.4", "ban-sensitive-files": "1.9.2", @@ -140,7 +142,7 @@ "standard": "12.0.1", "travis-deploy-once": "5.0.11", "ts-loader": "^5.3.3", - "tslint": "^5.12.1", + "tslint": "^5.13.0", "tslint-microsoft-contrib": "^6.0.0" }, "eslintConfig": { diff --git a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts index 679f50fa..35e5adb1 100644 --- a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts +++ b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts @@ -102,6 +102,9 @@ export class StartDialog { authoringKey = this.retrieveAuthoringKey(); } + process.stdout.write(`${GBAdminService.GB_PROMPT}Thank you. That is enough information.\nNow building farm...`); + + // Prepares the first instance on bot farm. const instance: IGBInstance = {}; diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts index d062353a..9ea23c35 100644 --- a/packages/core.gbapp/services/GBConversationalService.ts +++ b/packages/core.gbapp/services/GBConversationalService.ts @@ -93,10 +93,12 @@ export class GBConversationalService implements IGBConversationalService { public async routeNLP(step: any, min: GBMinInstance, text: string): Promise { // Invokes LUIS. + let endpoint = min.instance.nlpEndpoint.replace('/luis/v2.0', ''); + const model = new LuisRecognizer({ applicationId: min.instance.nlpAppId, endpointKey: min.instance.nlpKey, - endpoint: min.instance.nlpEndpoint + endpoint: endpoint }); let nlp: any; @@ -130,7 +132,7 @@ export class GBConversationalService implements IGBConversationalService { logger.info(`NLP called: ${intent}, ${entity}`); try { - await step.replace(`/${intent}`, nlp.entities); + await step.replaceDialog(`/${intent}`, nlp.entities); return Promise.resolve(true); } catch (error) { diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts index 8716a1d7..bfc9a9ef 100644 --- a/packages/core.gbapp/services/GBCoreService.ts +++ b/packages/core.gbapp/services/GBCoreService.ts @@ -51,6 +51,7 @@ import { GBWhatsappPackage } from '../../whatsapp.gblib/index'; import { GuaribasInstance } from '../models/GBModel'; import { GBConfigService } from './GBConfigService'; import { StartDialog } from '../../azuredeployer.gbapp/dialogs/StartDialog'; +import { WaterfallDialog } from 'botbuilder-dialogs'; const logger = require('../../../src/logger'); const opn = require('opn'); diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index bd4643e8..086cb54b 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -45,7 +45,7 @@ const AuthenticationContext = require('adal-node').AuthenticationContext; import { AutoSaveStateMiddleware, BotFrameworkAdapter, ConversationState, MemoryStorage, UserState } from 'botbuilder'; -import { ConfirmPrompt } from 'botbuilder-dialogs'; +import { ConfirmPrompt, WaterfallDialog } from 'botbuilder-dialogs'; import { GBMinInstance, IGBAdminService, IGBConversationalService, IGBCoreService, IGBPackage } from 'botlib'; import { GBAnalyticsPackage } from '../../analytics.gblib'; import { GBCorePackage } from '../../core.gbapp'; @@ -356,9 +356,15 @@ export class GBMinService { } }, this); - appPackages.forEach(e => { - e.sysPackages = sysPackages; - e.loadBot(min); + appPackages.forEach(p => { + p.sysPackages = sysPackages; + p.loadBot(min); + if (p.getDialogs !== undefined) { + let dialogs = p.getDialogs(min); + dialogs.forEach(dialog => { + min.dialogs.add(new WaterfallDialog(dialog.name, dialog.waterfall)); + }); + } }, this); } @@ -473,7 +479,6 @@ export class GBMinService { let isVMCall = Object.keys(min.scriptMap).find(key => min.scriptMap[key] === context.activity.text) !== undefined; if (isVMCall) { - let mainMethod = context.activity.text; min.sandbox.context = context; diff --git a/packages/kb.gbapp/dialogs/AskDialog.ts b/packages/kb.gbapp/dialogs/AskDialog.ts index eb667b7d..5d7bfa34 100644 --- a/packages/kb.gbapp/dialogs/AskDialog.ts +++ b/packages/kb.gbapp/dialogs/AskDialog.ts @@ -204,5 +204,7 @@ export class AskDialog extends IGBDialog { } ]) ); + + } }