Skip to content

Commit 05aeafd

Browse files
StevenicStevenic
committed
Updated to support TypeScript 2.1
- Published new 3.5.3 release.
1 parent f2c9341 commit 05aeafd

38 files changed

+264
-251
lines changed

‎Node/core/lib/DefaultLocalizer.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"use strict";
2-
var logger = require('./logger');
3-
var consts = require('./consts');
4-
var fs = require('fs');
5-
var async = require('async');
6-
var Promise = require('promise');
7-
var path = require('path');
2+
var logger = require("./logger");
3+
var consts = require("./consts");
4+
var fs = require("fs");
5+
var async = require("async");
6+
var Promise = require("promise");
7+
var path = require("path");
88
var DefaultLocalizer = (function () {
99
function DefaultLocalizer(root, defaultLocale) {
1010
this.localePaths = [];

‎Node/core/lib/Message.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"use strict";
2-
var HeroCard_1 = require('./cards/HeroCard');
3-
var CardImage_1 = require('./cards/CardImage');
4-
var CardAction_1 = require('./cards/CardAction');
5-
var utils = require('./utils');
6-
var consts = require('./consts');
7-
var sprintf = require('sprintf-js');
2+
var HeroCard_1 = require("./cards/HeroCard");
3+
var CardImage_1 = require("./cards/CardImage");
4+
var CardAction_1 = require("./cards/CardAction");
5+
var utils = require("./utils");
6+
var consts = require("./consts");
7+
var sprintf = require("sprintf-js");
88
exports.TextFormat = {
99
plain: 'plain',
1010
markdown: 'markdown',

‎Node/core/lib/Session.js

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,32 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function __() { this.constructor = d; }
55
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
66
};
7-
var Dialog_1 = require('./dialogs/Dialog');
8-
var Message_1 = require('./Message');
9-
var consts = require('./consts');
10-
var logger = require('./logger');
11-
var sprintf = require('sprintf-js');
12-
var events = require('events');
7+
var Dialog_1 = require("./dialogs/Dialog");
8+
var Message_1 = require("./Message");
9+
var consts = require("./consts");
10+
var logger = require("./logger");
11+
var sprintf = require("sprintf-js");
12+
var events = require("events");
1313
var Session = (function (_super) {
1414
__extends(Session, _super);
1515
function Session(options) {
16-
_super.call(this);
17-
this.options = options;
18-
this.msgSent = false;
19-
this._isReset = false;
20-
this.lastSendTime = new Date().getTime();
21-
this.batch = [];
22-
this.batchStarted = false;
23-
this.sendingBatch = false;
24-
this.inMiddleware = false;
25-
this._locale = null;
26-
this.localizer = null;
27-
this.library = options.library;
28-
this.localizer = options.localizer;
29-
if (typeof this.options.autoBatchDelay !== 'number') {
30-
this.options.autoBatchDelay = 250;
31-
}
16+
var _this = _super.call(this) || this;
17+
_this.options = options;
18+
_this.msgSent = false;
19+
_this._isReset = false;
20+
_this.lastSendTime = new Date().getTime();
21+
_this.batch = [];
22+
_this.batchStarted = false;
23+
_this.sendingBatch = false;
24+
_this.inMiddleware = false;
25+
_this._locale = null;
26+
_this.localizer = null;
27+
_this.library = options.library;
28+
_this.localizer = options.localizer;
29+
if (typeof _this.options.autoBatchDelay !== 'number') {
30+
_this.options.autoBatchDelay = 250;
31+
}
32+
return _this;
3233
}
3334
Session.prototype.toRecognizeContext = function () {
3435
var _this = this;
@@ -43,14 +44,14 @@ var Session = (function (_super) {
4344
gettext: function () {
4445
var args = [];
4546
for (var _i = 0; _i < arguments.length; _i++) {
46-
args[_i - 0] = arguments[_i];
47+
args[_i] = arguments[_i];
4748
}
4849
return Session.prototype.gettext.call(_this, args);
4950
},
5051
ngettext: function () {
5152
var args = [];
5253
for (var _i = 0; _i < arguments.length; _i++) {
53-
args[_i - 0] = arguments[_i];
54+
args[_i] = arguments[_i];
5455
}
5556
return Session.prototype.ngettext.call(_this, args);
5657
},

‎Node/core/lib/botbuilder.js

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
"use strict";
2-
var Session = require('./Session');
3-
var Message = require('./Message');
4-
var Dialog = require('./dialogs/Dialog');
5-
var DialogAction = require('./dialogs/DialogAction');
6-
var Prompts = require('./dialogs/Prompts');
7-
var SimpleDialog = require('./dialogs/SimpleDialog');
8-
var EntityRecognizer = require('./dialogs/EntityRecognizer');
9-
var Library = require('./bots/Library');
10-
var UniversalBot = require('./bots/UniversalBot');
11-
var ChatConnector = require('./bots/ChatConnector');
12-
var ConsoleConnector = require('./bots/ConsoleConnector');
13-
var BotStorage = require('./storage/BotStorage');
14-
var CardAction = require('./cards/CardAction');
15-
var HeroCard = require('./cards/HeroCard');
16-
var CardImage = require('./cards/CardImage');
17-
var ReceiptCard = require('./cards/ReceiptCard');
18-
var SigninCard = require('./cards/SigninCard');
19-
var ThumbnailCard = require('./cards/ThumbnailCard');
20-
var VideoCard = require('./cards/VideoCard');
21-
var AudioCard = require('./cards/AudioCard');
22-
var AnimationCard = require('./cards/AnimationCard');
23-
var MediaCard = require('./cards/MediaCard');
24-
var CardMedia = require('./cards/CardMedia');
25-
var Keyboard = require('./cards/Keyboard');
26-
var Middleware = require('./middleware/Middleware');
27-
var IntentRecognizerSet = require('./dialogs/IntentRecognizerSet');
28-
var RegExpRecognizer = require('./dialogs/RegExpRecognizer');
29-
var LuisRecognizer = require('./dialogs/LuisRecognizer');
30-
var IntentDialog = require('./dialogs/IntentDialog');
2+
var Session = require("./Session");
3+
var Message = require("./Message");
4+
var Dialog = require("./dialogs/Dialog");
5+
var DialogAction = require("./dialogs/DialogAction");
6+
var Prompts = require("./dialogs/Prompts");
7+
var SimpleDialog = require("./dialogs/SimpleDialog");
8+
var EntityRecognizer = require("./dialogs/EntityRecognizer");
9+
var Library = require("./bots/Library");
10+
var UniversalBot = require("./bots/UniversalBot");
11+
var ChatConnector = require("./bots/ChatConnector");
12+
var ConsoleConnector = require("./bots/ConsoleConnector");
13+
var BotStorage = require("./storage/BotStorage");
14+
var CardAction = require("./cards/CardAction");
15+
var HeroCard = require("./cards/HeroCard");
16+
var CardImage = require("./cards/CardImage");
17+
var ReceiptCard = require("./cards/ReceiptCard");
18+
var SigninCard = require("./cards/SigninCard");
19+
var ThumbnailCard = require("./cards/ThumbnailCard");
20+
var VideoCard = require("./cards/VideoCard");
21+
var AudioCard = require("./cards/AudioCard");
22+
var AnimationCard = require("./cards/AnimationCard");
23+
var MediaCard = require("./cards/MediaCard");
24+
var CardMedia = require("./cards/CardMedia");
25+
var Keyboard = require("./cards/Keyboard");
26+
var Middleware = require("./middleware/Middleware");
27+
var IntentRecognizerSet = require("./dialogs/IntentRecognizerSet");
28+
var RegExpRecognizer = require("./dialogs/RegExpRecognizer");
29+
var LuisRecognizer = require("./dialogs/LuisRecognizer");
30+
var IntentDialog = require("./dialogs/IntentDialog");
3131
exports.Session = Session.Session;
3232
exports.Message = Message.Message;
3333
exports.AttachmentLayout = Message.AttachmentLayout;
@@ -67,10 +67,10 @@ exports.ChatConnector = ChatConnector.ChatConnector;
6767
exports.ConsoleConnector = ConsoleConnector.ConsoleConnector;
6868
exports.MemoryBotStorage = BotStorage.MemoryBotStorage;
6969
exports.Middleware = Middleware.Middleware;
70-
var deprecatedBCB = require('./deprecated/BotConnectorBot');
71-
var deprecatedLD = require('./deprecated/LuisDialog');
72-
var deprecatedCD = require('./deprecated/CommandDialog');
73-
var deprecatedTB = require('./deprecated/TextBot');
70+
var deprecatedBCB = require("./deprecated/BotConnectorBot");
71+
var deprecatedLD = require("./deprecated/LuisDialog");
72+
var deprecatedCD = require("./deprecated/CommandDialog");
73+
var deprecatedTB = require("./deprecated/TextBot");
7474
exports.BotConnectorBot = deprecatedBCB.BotConnectorBot;
7575
exports.LuisDialog = deprecatedLD.LuisDialog;
7676
exports.CommandDialog = deprecatedCD.CommandDialog;

‎Node/core/lib/bots/ChatConnector.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
"use strict";
2-
var OpenIdMetadata_1 = require('./OpenIdMetadata');
3-
var utils = require('../utils');
4-
var logger = require('../logger');
5-
var consts = require('../consts');
6-
var request = require('request');
7-
var async = require('async');
8-
var url = require('url');
9-
var jwt = require('jsonwebtoken');
10-
var zlib = require('zlib');
2+
var OpenIdMetadata_1 = require("./OpenIdMetadata");
3+
var utils = require("../utils");
4+
var logger = require("../logger");
5+
var consts = require("../consts");
6+
var request = require("request");
7+
var async = require("async");
8+
var url = require("url");
9+
var jwt = require("jsonwebtoken");
10+
var zlib = require("zlib");
11+
var urlJoin = require("url-join");
1112
var pjson = require('../../package.json');
1213
var MAX_DATA_LENGTH = 65000;
13-
var USER_AGENT = "Microsoft-BotFramework/3.0 (BotBuilder Node.js/" + pjson.version + ")";
14+
var USER_AGENT = "Microsoft-BotFramework/3.1 (BotBuilder Node.js/" + pjson.version + ")";
1415
var ChatConnector = (function () {
1516
function ChatConnector(settings) {
1617
if (settings === void 0) { settings = {}; }
@@ -155,7 +156,7 @@ var ChatConnector = (function () {
155156
if (address && address.user && address.bot && address.serviceUrl) {
156157
var options = {
157158
method: 'POST',
158-
url: url.resolve(address.serviceUrl, '/v3/conversations'),
159+
url: urlJoin(address.serviceUrl, '/v3/conversations'),
159160
body: {
160161
bot: address.bot,
161162
members: [address.user]
@@ -387,7 +388,7 @@ var ChatConnector = (function () {
387388
}
388389
var options = {
389390
method: 'POST',
390-
url: url.resolve(address.serviceUrl, path),
391+
url: urlJoin(address.serviceUrl, path),
391392
body: msg,
392393
json: true
393394
};

‎Node/core/lib/bots/ConsoleConnector.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
2-
var Message_1 = require('../Message');
3-
var utils = require('../utils');
4-
var readline = require('readline');
2+
var Message_1 = require("../Message");
3+
var utils = require("../utils");
4+
var readline = require("readline");
55
var ConsoleConnector = (function () {
66
function ConsoleConnector() {
77
this.replyCnt = 0;

‎Node/core/lib/bots/Library.js

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,27 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function __() { this.constructor = d; }
55
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
66
};
7-
var SimpleDialog_1 = require('../dialogs/SimpleDialog');
8-
var ActionSet_1 = require('../dialogs/ActionSet');
9-
var IntentRecognizerSet_1 = require('../dialogs/IntentRecognizerSet');
10-
var Session_1 = require('../Session');
11-
var consts = require('../consts');
12-
var utils = require('../utils');
13-
var logger = require('../logger');
14-
var events_1 = require('events');
15-
var path = require('path');
16-
var async = require('async');
7+
var SimpleDialog_1 = require("../dialogs/SimpleDialog");
8+
var ActionSet_1 = require("../dialogs/ActionSet");
9+
var IntentRecognizerSet_1 = require("../dialogs/IntentRecognizerSet");
10+
var Session_1 = require("../Session");
11+
var consts = require("../consts");
12+
var utils = require("../utils");
13+
var logger = require("../logger");
14+
var events_1 = require("events");
15+
var path = require("path");
16+
var async = require("async");
1717
var Library = (function (_super) {
1818
__extends(Library, _super);
1919
function Library(name) {
20-
_super.call(this);
21-
this.name = name;
22-
this.dialogs = {};
23-
this.libraries = {};
24-
this.actions = new ActionSet_1.ActionSet();
25-
this.recognizers = new IntentRecognizerSet_1.IntentRecognizerSet();
26-
this.triggersAdded = false;
20+
var _this = _super.call(this) || this;
21+
_this.name = name;
22+
_this.dialogs = {};
23+
_this.libraries = {};
24+
_this.actions = new ActionSet_1.ActionSet();
25+
_this.recognizers = new IntentRecognizerSet_1.IntentRecognizerSet();
26+
_this.triggersAdded = false;
27+
return _this;
2728
}
2829
Library.prototype.clone = function (copyTo, newName) {
2930
var obj = copyTo || new Library(newName || this.name);
@@ -436,13 +437,13 @@ var Library = (function (_super) {
436437
this.actions.endConversationAction(name, msg, options);
437438
return this;
438439
};
439-
Library.RouteTypes = {
440-
GlobalAction: 'GlobalAction',
441-
StackAction: 'StackAction',
442-
ActiveDialog: 'ActiveDialog'
443-
};
444440
return Library;
445441
}(events_1.EventEmitter));
442+
Library.RouteTypes = {
443+
GlobalAction: 'GlobalAction',
444+
StackAction: 'StackAction',
445+
ActiveDialog: 'ActiveDialog'
446+
};
446447
exports.Library = Library;
447448
exports.systemLib = new Library(consts.Library.system);
448449
exports.systemLib.localePath(path.join(__dirname, '../locale/'));

‎Node/core/lib/bots/OpenIdMetadata.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
2-
var logger = require('../logger');
3-
var request = require('request');
2+
var logger = require("../logger");
3+
var request = require("request");
44
var getPem = require('rsa-pem-from-mod-exp');
55
var base64url = require('base64url');
66
var OpenIdMetadata = (function () {

0 commit comments

Comments
 (0)