From bb1d49cecbbb916a1ae5503b1d369edde0045610 Mon Sep 17 00:00:00 2001 From: Rohan Sircar Date: Wed, 15 Jan 2020 11:16:35 +0530 Subject: [PATCH] added minifying using terser --- chatto/.gitignore | 5 +- chatto/pom.xml | 10 +- chatto/src/main/javascript/Gruntfile.js | 49 +- chatto/src/main/javascript/bundle.js | 614 -------------------- chatto/src/main/javascript/package.json | 4 +- chatto/src/main/javascript/ts/tsconfig.json | 2 +- chatto/src/main/javascript/yarn.lock | 350 ++--------- 7 files changed, 82 insertions(+), 952 deletions(-) delete mode 100644 chatto/src/main/javascript/bundle.js diff --git a/chatto/.gitignore b/chatto/.gitignore index 586aaed..a7ad434 100644 --- a/chatto/.gitignore +++ b/chatto/.gitignore @@ -31,7 +31,8 @@ build/ .vscode/ ../vscode/ -src/main/javascript/node_modules +node_modules config/ -src/main/resources/static/js/bundle.js +bundle.js +bundle.min.js src/main/javascript/node/ \ No newline at end of file diff --git a/chatto/pom.xml b/chatto/pom.xml index 193b9cf..6510969 100644 --- a/chatto/pom.xml +++ b/chatto/pom.xml @@ -15,6 +15,7 @@ 11 + @@ -178,15 +179,10 @@ grunt - - - generate-resources - - - browserify + ${gruntArg} + diff --git a/chatto/src/main/javascript/Gruntfile.js b/chatto/src/main/javascript/Gruntfile.js index 683a95b..f8416e1 100644 --- a/chatto/src/main/javascript/Gruntfile.js +++ b/chatto/src/main/javascript/Gruntfile.js @@ -3,35 +3,49 @@ module.exports = function(grunt) { // Project configuration. grunt.initConfig({ pkg: grunt.file.readJSON('package.json'), - // uglify: { - // options: { - // banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n' - // }, - // build: { - // src: 'src/<%= pkg.name %>.js', - // dest: 'build/<%= pkg.name %>.min.js' - // } - // }, + terser: { + options: { + // Task-specific options go here. + }, + build: { + // Target-specific file lists and/or options go here. + src: '../resources/static/js/bundle.js', + dest: '../resources/static/js/bundle.min.js' + }, + }, browserify: { - main: { + dev: { src: 'ts/src/main.ts', - dest: '../resources/static/js/bundle.js' + dest: '../resources/static/js/bundle.js', + options: { + browserifyOptions: { + debug: true + }, + } + }, + prod: { + src: 'ts/src/main.ts', + dest: '../resources/static/js/bundle.js', + banner: '/*! Chat.js <%= grunt.template.today("yyyy-mm-dd") %> */ ', + options: { + browserifyOptions: { + debug: false + }, + } }, options: { plugin: [ - ['tsify', { target: 'es2017', noImplicitAny: true }], // register plugin by name + ['tsify', { target: 'ES6', noImplicitAny: true }], // register plugin by name ], - browserifyOptions: { - debug: true - }, + browserifyOptions: {}, } } }); // Load the plugin that provides the "uglify" task. - // grunt.loadNpmTasks('grunt-contrib-uglify'); + grunt.loadNpmTasks('grunt-terser'); // // Default task(s). // grunt.registerTask('default', ['uglify']); @@ -40,6 +54,7 @@ module.exports = function(grunt) { - grunt.registerTask('default', ['browserify']) + grunt.registerTask('default', ['browserify:dev']) + grunt.registerTask('prod', ["browserify:prod", "terser"]) }; \ No newline at end of file diff --git a/chatto/src/main/javascript/bundle.js b/chatto/src/main/javascript/bundle.js deleted file mode 100644 index b986b70..0000000 --- a/chatto/src/main/javascript/bundle.js +++ /dev/null @@ -1,614 +0,0 @@ -(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i '; -}); - -}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) - -},{"./controller/ChatController":1,"./controller/UserController":2,"./model/ChatModel":5,"./model/UserModel":8,"./service/SJCLEncryptionService":9,"./singleton/JsonAPI":10,"./view/ChatView":13,"./view/UserView":14}],4:[function(require,module,exports){ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); - -},{}],5:[function(require,module,exports){ -(function (global){ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const log = (typeof window !== "undefined" ? window['log'] : typeof global !== "undefined" ? global['log'] : null); -const ChatModelHelper_1 = require("./ChatModelHelper"); -class ChatModel { - constructor() { - /** - * @type {Observer[]} List of subscribers. In real life, the list of - * subscribers can be stored more comprehensively (categorized by event - * type, etc.). - */ - this._observers = []; - this.state = null; - this._messagesMap = new Map(); - } - /** - * The subscription management methods. - */ - attach(observer) { - console.log('Subject: Attached an observer.'); - this._observers.push(observer); - } - detach(observer) { - const observerIndex = this._observers.indexOf(observer); - this._observers.splice(observerIndex, 1); - console.log('Subject: Detached an observer.'); - } - setUserMessages(username, messages) { - this._messagesMap.set(username, messages); - } - /** - * Trigger an update in each subscriber. - */ - notify() { - console.log('Subject: Notifying observers...'); - for (const observer of this._observers) { - observer.update(this.state); - } - } - someBusinessMethod(chatMessageList) { - this.state = chatMessageList; - this.helperMethod(); - console.log(`Subject: My state has just changed`); - console.log(chatMessageList); - this.notify(); - } - getmessages(userName, passphrase, lastMessageTime) { - const cVMs = ChatModelHelper_1.ChatModelHelper.getMessages(userName, passphrase, lastMessageTime, this); - if (cVMs != null) { - log.info('Subject: My state has just changed'); - log.debug(cVMs); - this._messagesMap.set(userName, cVMs); - this.notify(); - } - else { - log.error('Messages were null'); - } - } - helperMethod() { } - populateMessages() { - } -} -exports.ChatModel = ChatModel; - -}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) - -},{"./ChatModelHelper":6}],6:[function(require,module,exports){ -(function (global){ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -const log = (typeof window !== "undefined" ? window['log'] : typeof global !== "undefined" ? global['log'] : null); -const ChatMessageViewModel_1 = require("../viewmodel/ChatMessageViewModel"); -const JsonAPI_1 = require("../singleton/JsonAPI"); -const FetchErrorHandler_1 = require("./FetchErrorHandler"); -const SJCLEncryptionService_1 = require("../service/SJCLEncryptionService"); -class ChatModelHelper { - static getMessages(userName, passphrase, lastMessageTime, chatModel) { - switch (lastMessageTime) { - case null: { - this.getAllMessagesAjax(userName) - .then((data) => { - log.debug(`Subject: received all messages`); - // let userNames = data.map(ChatMessageViewModel => ChatMessageViewModel.fromUser) - // let sumt = data.map(chatMessageViewModel => { return this.encryptionService.decrypt(passphrase, chatMessageViewModel.messageCipher) }); - return data.map(vm => this.toChatMessageVM(vm, passphrase)); - // chatModel.setUserMessages(userName, chatMessageVMs); - // chatModel.notify(); - }); - break; - } - default: { - this.getNewMessagesAjax(userName, lastMessageTime) - .then((data) => { - log.debug(`Subject: received new messages`); - return data.map(vm => this.toChatMessageVM(vm, passphrase)); - // chatModel.setUserMessages(userName, chatMessageVMs); - // this.state = data; - // chatModel.notify(); - }); - break; - } - } - return null; - } - static toChatMessageVM(chatMessageDTO, passphrase) { - const vm = new ChatMessageViewModel_1.ChatMessageViewModel(); - vm.fromUser = chatMessageDTO.fromUser; - vm.toUser = chatMessageDTO.toUser; - vm.messageTime = chatMessageDTO.messageTime; - vm.message = this.encryptionService.decrypt(passphrase, chatMessageDTO.messageCipher); - return vm; - } - static getAllMessagesAjax(toUser) { - return __awaiter(this, void 0, void 0, function* () { - let headers = new Headers(); - if (JsonAPI_1.JsonAPI.authToken == null) { - log.error("authToken null"); - return; - } - ; - headers.append('X-AUTH-TOKEN', JsonAPI_1.JsonAPI.authToken); - let response = yield fetch(`${JsonAPI_1.JsonAPI.CHAT_MESSAGES_GET}/${toUser}`, { - method: 'GET', - headers: headers - }); - console.log(response.clone()); - if (FetchErrorHandler_1.fetchErrorHandler(response.clone())) { - return null; - } - let data = yield response.json(); - return data; - }); - } - static getNewMessagesAjax(toUser, lastMessageTimeStamp) { - return __awaiter(this, void 0, void 0, function* () { - let headers = new Headers(); - if (JsonAPI_1.JsonAPI.authToken == null) { - log.error("authToken null"); - return; - } - ; - headers.append('X-AUTH-TOKEN', JsonAPI_1.JsonAPI.authToken); - let response = yield fetch(`${JsonAPI_1.JsonAPI.CHAT_MESSAGES_GET}/${toUser}/${lastMessageTimeStamp}`, { - method: 'GET', - headers: headers - }); - console.log(response.clone()); - if (FetchErrorHandler_1.fetchErrorHandler(response.clone())) { - return null; - } - let data = yield response.json(); - return data; - }); - } -} -exports.ChatModelHelper = ChatModelHelper; -ChatModelHelper.encryptionService = new SJCLEncryptionService_1.SJCLEncryptionService(); - -}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) - -},{"../service/SJCLEncryptionService":9,"../singleton/JsonAPI":10,"../viewmodel/ChatMessageViewModel":16,"./FetchErrorHandler":7}],7:[function(require,module,exports){ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -function fetchErrorHandler(response) { - // alertify.success('Current position : ' + alertify.get('notifier', 'position')); - if (!response.ok) { - return response.text().catch(err => { - // the status was not ok and there is no json body - // throw new Error(response.statusText); - // window.alert(sprintf('Some error occured. Http code is %s', response.status)); - // alertify.error(sprintf('Some error occured. Http code is %s', response.status)); - return true; - }).then(json => { - // the status was not ok but there is a json body - // throw new Error(json.error.message); // example error message returned by a REST API - // window.alert(sprintf('Error: %s (Http code %s)', json, response.status)); - // alertify.error(sprintf('Some error occured. Http code is %s', response.status)); - console.log(json); - return true; - }); - } -} -exports.fetchErrorHandler = fetchErrorHandler; - -},{}],8:[function(require,module,exports){ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -const FetchErrorHandler_1 = require("./FetchErrorHandler"); -const JsonAPI_1 = require("../singleton/JsonAPI"); -class UserModel { - // @ts-ignore: Cannot find name 'hostAddress'. - constructor() { - /** - * @type {Observer[]} List of subscribers. In real life, the list of - * subscribers can be stored more comprehensively (categorized by event - * type, etc.). - */ - this.observers = []; - } - /** - * The subscription management methods. - */ - attach(observer) { - console.log('Subject: Attached an observer.'); - this.observers.push(observer); - } - detach(observer) { - const observerIndex = this.observers.indexOf(observer); - this.observers.splice(observerIndex, 1); - console.log('Subject: Detached an observer.'); - } - /** - * Trigger an update in each subscriber. - */ - notify() { - console.log('Subject: Notifying observers...'); - for (const observer of this.observers) { - observer.update(this.state); - } - } - someBusinessMethod(activeuserList) { - this.state = activeuserList; - this.helperMethod(); - console.log(`Subject: My state has just changed`); - console.log(activeuserList); - this.notify(); - } - /** - * getActiveUsers - */ - getActiveUsers() { - this.getActiveUsersAjax("", JsonAPI_1.JsonAPI.ACTIVE_USERS_GET) - .then(data => { - // // activeUsers = data; - // sessionStorage.setItem('activeUsers', JSON.stringify(data)); - // console.log(sessionStorage.getItem('activeUsers')); - console.log(`Subject: received ajax active users`); - this.state = data; - this.notify(); - }); - } - getActiveUsersAjax(authToken2, URL) { - return __awaiter(this, void 0, void 0, function* () { - let headers = new Headers(); - // headers.append('Authorization', basicAuthToken); - headers.append('X-AUTH-TOKEN', authToken2); - let response = yield fetch(JsonAPI_1.JsonAPI.ACTIVE_USERS_GET, { - method: 'GET', - headers: headers - }); - console.log(response.clone()); - if (FetchErrorHandler_1.fetchErrorHandler(response.clone())) { - return null; - } - let data = yield response.json(); - // return data; - return new Promise((resolve, reject) => { - if (data != null) - resolve(data); - else - reject('Response data null'); - }); - }); - } - helperMethod() { } -} -exports.UserModel = UserModel; - -},{"../singleton/JsonAPI":10,"./FetchErrorHandler":7}],9:[function(require,module,exports){ -(function (global){ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const sjcl = (typeof window !== "undefined" ? window['sjcl'] : typeof global !== "undefined" ? global['sjcl'] : null); -class SJCLEncryptionService { - constructor() { - this.params = { mode: "gcm", ts: 128, adata: "", iter: 10000 }; - } - encrypt(passphrase, plainText) { - return sjcl.encrypt(passphrase, plainText, this.params); - } - decrypt(passphrase, cipher) { - return sjcl.decrypt(passphrase, cipher, undefined, undefined); - } -} -exports.SJCLEncryptionService = SJCLEncryptionService; - -}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) - -},{}],10:[function(require,module,exports){ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var JsonAPI; -(function (JsonAPI) { - // @ts-ignore: Cannot find name 'hostAddress'. - JsonAPI.userName = localStorage.getItem('userName'); - JsonAPI.authToken = localStorage.getItem('authToken'); - JsonAPI.ACTIVE_USERS_GET = `/api/chat/get/active-users`; - JsonAPI.CHAT_MESSAGES_GET = ``; -})(JsonAPI = exports.JsonAPI || (exports.JsonAPI = {})); - -},{}],11:[function(require,module,exports){ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -class TemplateFactory { - // static getTemplate(templateName: string): Handlebars.TemplateDelegate { - // switch (templateName) { - // case "user-contact-online-template": { - // // let source = document.getElementById("user-contact-online-template").innerHTML; - // // let msgContainerTemplate = Handlebars.compile(source); - // // return msgContainerTemplate; - // return this.createTemplate(templateName); - // } - // case "msg_container_send_template": { - // // let source = document.getElementById("msg_container_send_template").innerHTML; - // // let msgContainerTemplate = Handlebars.compile(source); - // // return msgContainerTemplate; - // return this.createTemplate(templateName); - // } - // case "msg_container_template": { - // // let source = document.getElementById("msg_container_send_template").innerHTML; - // // let msgContainerTemplate = Handlebars.compile(source); - // // return msgContainerTemplate; - // return this.createTemplate(templateName); - // } - // default: - // throw new Error('invalid template name'); - // } - // } - static getTemplate(templateName) { - //@ts-ignore: Object is possibly 'null'. - let source = document.getElementById(templateName).innerHTML; - let msgContainerTemplate = Handlebars.compile(source); - return msgContainerTemplate; - } -} -exports.TemplateFactory = TemplateFactory; - -},{}],12:[function(require,module,exports){ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); - -},{}],13:[function(require,module,exports){ -(function (global){ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const TemplateFactory_1 = require("../template/TemplateFactory"); -const log = (typeof window !== "undefined" ? window['log'] : typeof global !== "undefined" ? global['log'] : null); -class ChatView { - constructor(model, element) { - this._messageSendTemplate = TemplateFactory_1.TemplateFactory.getTemplate('msg_container_send_template'); - this._model = model; - this._element = element; - } - update(data) { - let html = ""; - data.forEach((vm) => { - html += this._messageSendTemplate(vm); - }); - this._element.innerHTML = html; - log.debug(this._element.innerHTML); - } -} -exports.ChatView = ChatView; - -}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) - -},{"../template/TemplateFactory":11}],14:[function(require,module,exports){ -(function (global){ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const TemplateFactory_1 = require("../template/TemplateFactory"); -const log = (typeof window !== "undefined" ? window['log'] : typeof global !== "undefined" ? global['log'] : null); -class UserView { - // private userBoxes: any[] = []; - constructor(model, chatModel, element) { - this._model = model; - this._chatModel = chatModel; - this._element = element; - } - update(data) { - let template = TemplateFactory_1.TemplateFactory.getTemplate('user-contact-online-template'); - let html = ""; - data.forEach((element) => { - html += template(element); - }); - this._element.innerHTML = html; - this.addUserCallBacks(); - console.log(this._element.innerHTML); - } - helper() { - } - addUserCallBacks() { - let userBoxes = document.getElementsByClassName('user-box'); - for (let i = 0; i < userBoxes.length; i++) { - let userBox = userBoxes[i]; - userBoxes[i].addEventListener('click', this.userCallBack.bind(this, userBox)); - } - } - userCallBack(el) { - let current = document.getElementsByClassName('user-box active'); - let passphrase = ''; - if (current.length > 0) { - let passphraseInput = document.getElementById('passphrase'); - if (passphraseInput == null) { - log.error('passphraseInput element reference is null'); - return; - } - passphrase = passphraseInput.value; - if (passphrase == '' || passphrase == null) { - // alert('Please input passphrase') - // alertify.error('Please enter a passphrase'); - log.error('passphrase is empty or null'); - return; - } - current[0].className = current[0].className.replace(" active", ""); - } - // Add the active class to the current/clicked button - else if (current.length == 0) { - let elem = document.getElementById('passphrase-initial'); - if (elem == null) { - log.error('passphraseInput element reference is null'); - return; - } - passphrase = elem.value; - if (passphrase == '' || passphrase == null) { - // // alert('Please input passphrase') - // // alertify.error('Please enter a passphrase'); - log.error('passphrase is empty or null'); - return; - } - // @ts-ignore: Object is possibly 'null'. - document.getElementById('no-user-selected').hidden = true; - // @ts-ignore: Object is possibly 'null'. - document.getElementById('chat-card').hidden = false; - // @ts-ignore: Object is possibly 'null'. - elem.hidden = true; - } - // console.log(this.getElementsByClassName('to-user-span')); - let elem = el.getElementsByClassName('to-user-span')[0]; - let userName = elem.innerText; - // @ts-ignore: Object is possibly 'null'. - document.getElementById('user-name-span').innerText = userName; - this._chatModel.getmessages(userName, passphrase, null); - // populateMessages(userName, passphrase); - sessionStorage.setItem('selectedUser', userName); - el.className += " active"; - } -} -exports.UserView = UserView; - -}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) - -},{"../template/TemplateFactory":11}],15:[function(require,module,exports){ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -class ActiveUserViewModel { -} -exports.ActiveUserViewModel = ActiveUserViewModel; - -},{}],16:[function(require,module,exports){ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -class ChatMessageViewModel { -} -exports.ChatMessageViewModel = ChatMessageViewModel; - -},{}]},{},[3]) -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../../../../../../usr/local/lib/node_modules/watchify/node_modules/browser-pack/_prelude.js","ts/src/controller/ChatController.ts","ts/src/controller/UserController.ts","ts/src/main.ts","ts/src/model/ChatModel.ts","ts/src/model/ChatModelHelper.ts","ts/src/model/FetchErrorHandler.ts","ts/src/model/UserModel.ts","ts/src/service/SJCLEncryptionService.ts","ts/src/singleton/JsonAPI.ts","ts/src/template/TemplateFactory.ts","ts/src/view/ChatView.ts","ts/src/view/UserView.ts","ts/src/viewmodel/ActiveUserViewModel.ts","ts/src/viewmodel/ChatMessageViewModel.ts"],"names":[],"mappings":"AAAA;;;ACCA,kCAA+B;AAC/B,8BAA2B;AAC3B,gCAA6B;AAC7B,4BAAyB;AAGzB,4EAAyE;AAIzE,MAAa,cAAc;IAKvB,YAAY,KAAgB,EAAE,IAAc;QACxC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACtB,CAAC;IAGD;;OAEG;IACI,YAAY,CAAC,EAA0B;QAC1C,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC;IAEM,IAAI;QACP,MAAM,qBAAqB,GAA2B,EAAE,CAAC;QACzD,IAAI,wBAAwB,GAAG,IAAI,2CAAoB,EAAE,CAAC;QAC1D,wBAAwB,CAAC,QAAQ,GAAG,OAAO,CAAC;QAC5C,wBAAwB,CAAC,MAAM,GAAG,OAAO,CAAC;QAC1C,wBAAwB,CAAC,OAAO,GAAG,EAAE,CAAC;QACtC,wBAAwB,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;QAClD,qBAAqB,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACzD,CAAC;CAGJ;AA7BD,wCA6BC;;;;;ACvCD,kCAA+B;AAC/B,8BAA2B;AAC3B,gCAA6B;AAC7B,4BAAyB;AAGzB,0EAAuE;AAGvE,MAAa,cAAc;IAKvB,YAAY,KAAY,EAAE,IAAc;QACpC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACtB,CAAC;IAGD;;OAEG;IACI,YAAY,CAAC,EAAyB;QACzC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC;IAEM,IAAI;QACP,MAAM,eAAe,GAA0B,EAAE,CAAC;QAClD,IAAI,uBAAuB,GAAG,IAAI,yCAAmB,EAAE,CAAC;QACxD,uBAAuB,CAAC,QAAQ,GAAG,WAAW,CAAC;QAC/C,uBAAuB,CAAC,UAAU,GAAG,WAAW,CAAC;QACjD,uBAAuB,CAAC,MAAM,GAAG,IAAI,CAAC;QACtC,eAAe,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC9C,uBAAuB,GAAG,IAAI,yCAAmB,EAAE,CAAC;QACpD,uBAAuB,CAAC,UAAU,GAAG,WAAW,CAAC;QACjD,uBAAuB,CAAC,MAAM,GAAG,IAAI,CAAC;QACtC,uBAAuB,CAAC,QAAQ,GAAG,aAAa,CAAC;QACjD,eAAe,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC9C,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IACvC,CAAC;CAGJ;AAlCD,wCAkCC;;;;;;AC3CD,iDAA6C;AAG7C,8CAA2C;AAC3C,gEAA6D;AAI7D,yCAAyC;AACzC,0CAA2C;AAC3C,iDAA8C;AAC9C,8CAA2C;AAC3C,gEAA6D;AAC7D,iDAA8C;AAC9C,mCAAmC;AACnC,gCAAgC;AAGhC,2EAAwE;AACxE,2CAA2C;AAC3C,IAAI,EAAE,GAAG,IAAI,UAAU,EAAE,CAAC;AAG1B,MAAM,OAAO,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;AAExD,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;AAErB,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;AAElC,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;AAClC,sDAAsD;AACtD,+JAA+J;AAC/J,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;AAE7D,wBAAwB;AAExB,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC3B,iBAAiB;AAGjB,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAC/D,cAAc,CAAC,IAAI,EAAE,CAAC;AAItB,iDAAiD;AACjD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAElB,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;AAC1D,+JAA+J;AAC/J,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AACnD,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAG/D,SAAS,QAAQ,CAAC,EAAuB;IACrC,gBAAgB;IAChB,kBAAkB;AACtB,CAAC;AAED,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACjB,qCAAqC;AAErC,yCAAyC;AACzC,IAAI,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC;AAEzE,IAAI,oBAAoB,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAEtD,iBAAO,CAAC,gBAAgB,GAAG,KAAK,CAAC;AAEjC,MAAM,iBAAiB,GAAsB,IAAI,6CAAqB,EAAE,CAAC;AACzE,IAAI,EAAE,GAAG,iBAAiB,CAAC,OAAO,CAAC,UAAU,EAAC,MAAM,CAAC,CAAC;AACtD,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;AAEvD,UAAU,CAAC,cAAc,CAAC,QAAQ,EAAE;IAChC,OAAO,8IAA8I,CAAC;AAC1J,CAAC,CAAC,CAAC;;;;;;;;;;;;ACrEH,gCAAiC;AAIjC,uDAAoD;AAEpD,MAAa,SAAS;IAUlB;QATA;;;;QAIA;QACiB,eAAU,GAAe,EAAE,CAAC;QAKzC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;IAClC,CAAC;IACD;;OAEG;IACI,MAAM,CAAC,QAAkB;QAC5B,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAC9C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAEM,MAAM,CAAC,QAAkB;QAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IAClD,CAAC;IAEM,eAAe,CAAC,QAAgB,EAAE,QAAgC;QACrE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED;;OAEG;IACI,MAAM;QACT,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;QAC/C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE;YACpC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC/B;IACL,CAAC;IAEM,kBAAkB,CAAC,eAAuC;QAC7D,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC;QAC7B,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAEM,WAAW,CAAC,QAAgB,EAAE,UAAkB,EAAE,eAA8B;QACnF,MAAM,IAAI,GAAG,iCAAe,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;QACtF,IAAI,IAAI,IAAI,IAAI,EAAE;YACd,GAAG,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAA;YAC9C,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAChB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YACtC,IAAI,CAAC,MAAM,EAAE,CAAC;SACjB;aACI;YACD,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACnC;IACL,CAAC;IAIO,YAAY,KAAK,CAAC;IAEnB,gBAAgB;IAEvB,CAAC;CAIJ;AAzED,8BAyEC;;;;;;;;;;;;;;;;;ACpFD,gCAAgC;AAEhC,4EAAyE;AAEzE,kDAA+C;AAE/C,2DAAwD;AAGxD,4EAAyE;AAGzE,MAAa,eAAe;IAGjB,MAAM,CAAC,WAAW,CAAC,QAAgB,EAAE,UAAkB,EAAE,eAA8B,EAAE,SAAoB;QAChH,QAAQ,eAAe,EAAE;YACrB,KAAK,IAAI,CAAC,CAAC;gBACP,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;qBAC5B,IAAI,CAAC,CAAC,IAAsB,EAAE,EAAE;oBAC7B,GAAG,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;oBAC5C,kFAAkF;oBAClF,0IAA0I;oBAC1I,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAC;oBAC5D,uDAAuD;oBACvD,sBAAsB;gBAC1B,CAAC,CAAC,CAAA;gBACN,MAAM;aACT;YACD,OAAO,CAAC,CAAC;gBACL,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,eAAe,CAAC;qBAC7C,IAAI,CAAC,CAAC,IAAsB,EAAE,EAAE;oBAC7B,GAAG,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;oBAC5C,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAC;oBAC5D,uDAAuD;oBACvD,qBAAqB;oBACrB,sBAAsB;gBAC1B,CAAC,CAAC,CAAA;gBACN,MAAM;aACT;SACJ;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,MAAM,CAAC,eAAe,CAAC,cAA8B,EAAE,UAAkB;QAC7E,MAAM,EAAE,GAAG,IAAI,2CAAoB,EAAE,CAAC;QACtC,EAAE,CAAC,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;QACtC,EAAE,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;QAClC,EAAE,CAAC,WAAW,GAAG,cAAc,CAAC,WAAW,CAAC;QAC5C,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,aAAa,CAAW,CAAC;QAChG,OAAO,EAAE,CAAC;IACd,CAAC;IAEO,MAAM,CAAO,kBAAkB,CAAC,MAAc;;YAClD,IAAI,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,iBAAO,CAAC,SAAS,IAAI,IAAI,EAAE;gBAC3B,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;gBAC5B,OAAO;aACV;YAAA,CAAC;YACF,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAClD,IAAI,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,iBAAO,CAAC,iBAAiB,IAAI,MAAM,EAAE,EAAE;gBACjE,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,OAAO;aACnB,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;YAC9B,IAAI,qCAAiB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE;gBACrC,OAAO,IAAI,CAAC;aACf;YACD,IAAI,IAAI,GAAiB,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC/C,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IAEO,MAAM,CAAO,kBAAkB,CAAC,MAAc,EAAE,oBAA4B;;YAChF,IAAI,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,iBAAO,CAAC,SAAS,IAAI,IAAI,EAAE;gBAC3B,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;gBAC5B,OAAO;aACV;YAAA,CAAC;YACF,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC;YAClD,IAAI,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,iBAAO,CAAC,iBAAiB,IAAI,MAAM,IAAI,oBAAoB,EAAE,EAAE;gBACzF,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,OAAO;aACnB,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;YAC9B,IAAI,qCAAiB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE;gBACrC,OAAO,IAAI,CAAC;aACf;YACD,IAAI,IAAI,GAAiB,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC/C,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;;AA9EL,0CA+EC;AA9E2B,iCAAiB,GAAG,IAAI,6CAAqB,EAAE,CAAC;;;;;;;ACf5E,SAAgB,iBAAiB,CAAC,QAAkB;IAChD,kFAAkF;IAClF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;QACd,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAC/B,kDAAkD;YAClD,wCAAwC;YACxC,iFAAiF;YACjF,mFAAmF;YACnF,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACX,iDAAiD;YACjD,uFAAuF;YACvF,4EAA4E;YAC5E,mFAAmF;YACnF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAClB,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC,CAAC;KACN;AACL,CAAC;AAlBD,8CAkBC;;;;;;;;;;;;;;ACfD,2DAAwD;AAExD,kDAA+C;AAG/C,MAAa,SAAS;IAQlB,8CAA8C;IAE9C;QATA;;;;QAIA;QACiB,cAAS,GAAe,EAAE,CAAC;IAI5B,CAAC;IACjB;;OAEG;IACI,MAAM,CAAC,QAAkB;QAC5B,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAC9C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,QAAkB;QAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IACI,MAAM;QACT,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;QAC/C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE;YACnC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC/B;IACL,CAAC;IAEM,kBAAkB,CAAC,cAAqC;QAC3D,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC;QAC5B,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAED;;OAEG;IACI,cAAc;QACjB,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,iBAAO,CAAC,gBAAgB,CAAC;aAChD,IAAI,CAAC,IAAI,CAAC,EAAE;YACT,yBAAyB;YACzB,+DAA+D;YAC/D,sDAAsD;YACtD,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;YACnD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,IAAI,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC,CAAC,CAAA;IACV,CAAC;IAEK,kBAAkB,CAAC,UAAkB,EAAE,GAAW;;YACpD,IAAI,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;YAC5B,mDAAmD;YACnD,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;YAC3C,IAAI,QAAQ,GAAG,MAAM,KAAK,CAAC,iBAAO,CAAC,gBAAgB,EAAE;gBACjD,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,OAAO;aACnB,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;YAC9B,IAAI,qCAAiB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE;gBACrC,OAAO,IAAI,CAAC;aACf;YACD,IAAI,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACjC,eAAe;YACf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,IAAI,IAAI,IAAI,IAAI;oBACZ,OAAO,CAAC,IAAI,CAAC,CAAA;;oBAEb,MAAM,CAAC,oBAAoB,CAAC,CAAA;YACpC,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEO,YAAY,KAAK,CAAC;CAE7B;AAlFD,8BAkFC;;;;;;ACzFD,6BAA6B;AAE7B,MAAa,qBAAqB;IAAlC;QACqB,WAAM,GAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAC,CAAA;IAQlF,CAAC;IAPU,OAAO,CAAC,UAAkB,EAAE,SAAiB;QAChD,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IAEM,OAAO,CAAC,UAAkB,EAAE,MAAc;QAC7C,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,MAAkC,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IAC9F,CAAC;CACJ;AATD,sDASC;;;;;;;ACZD,IAAiB,OAAO,CAOvB;AAPD,WAAiB,OAAO;IACpB,8CAA8C;IACnC,gBAAQ,GAAkB,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3D,iBAAS,GAAkB,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC3D,wBAAgB,GAAG,4BAA4B,CAAC;IAChD,yBAAiB,GAAG,EAAE,CAAC;AAExC,CAAC,EAPgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAOvB;;;;;ACPD,MAAa,eAAe;IACxB,+EAA+E;IAE/E,8BAA8B;IAC9B,iDAAiD;IACjD,iGAAiG;IACjG,wEAAwE;IACxE,8CAA8C;IAC9C,wDAAwD;IACxD,YAAY;IACZ,gDAAgD;IAChD,gGAAgG;IAChG,wEAAwE;IACxE,8CAA8C;IAC9C,wDAAwD;IACxD,YAAY;IACZ,2CAA2C;IAC3C,gGAAgG;IAChG,wEAAwE;IACxE,8CAA8C;IAC9C,wDAAwD;IACxD,YAAY;IACZ,mBAAmB;IACnB,wDAAwD;IACxD,QAAQ;IACR,IAAI;IAEJ,MAAM,CAAC,WAAW,CAAC,YAAoB;QACnC,wCAAwC;QACxC,IAAI,MAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC;QAC7D,IAAI,oBAAoB,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACtD,OAAO,oBAAoB,CAAC;IAChC,CAAC;CACJ;AAjCD,0CAiCC;;;;;;;;;;AC5BD,iEAA8D;AAI9D,gCAAgC;AAEhC,MAAa,QAAQ;IAMjB,YAAY,KAAgB,EAAE,OAAoB;QAHjC,yBAAoB,GAAG,iCAAe,CAAC,WAAW,CAAC,6BAA6B,CAAC,CAAC;QAI/F,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5B,CAAC;IAGD,MAAM,CAAC,IAA4B;QAC/B,IAAI,IAAI,GAAW,EAAE,CAAC;QACtB,IAAI,CAAC,OAAO,CAAC,CAAC,EAAwB,EAAE,EAAE;YACtC,IAAI,IAAI,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC;QAC/B,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;CACJ;AApBD,4BAoBC;;;;;;;;AC1BD,iEAA8D;AAG9D,gCAAiC;AAEjC,MAAa,QAAQ;IAIjB,kCAAkC;IAGlC,YAAY,KAAY,EAAE,SAAoB,EAAE,OAAoB;QAChE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5B,CAAC;IAKD,MAAM,CAAC,IAA2B;QAC9B,IAAI,QAAQ,GAAG,iCAAe,CAAC,WAAW,CAAC,8BAA8B,CAAC,CAAC;QAC3E,IAAI,IAAI,GAAW,EAAE,CAAC;QACtB,IAAI,CAAC,OAAO,CAAC,CAAC,OAA4B,EAAE,EAAE;YAC1C,IAAI,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC;QAC/B,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAEO,MAAM;IAEd,CAAC;IAEO,gBAAgB;QACpB,IAAI,SAAS,GAAG,QAAQ,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC5D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvC,IAAI,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YAC3B,SAAS,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;SACjF;IACL,CAAC;IAGO,YAAY,CAAC,EAAW;QAC5B,IAAI,OAAO,GAAG,QAAQ,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;QAEjE,IAAI,UAAU,GAAW,EAAE,CAAC;QAC5B,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,IAAI,eAAe,GAAG,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAQ,CAAC;YAEnE,IAAI,eAAe,IAAI,IAAI,EAAE;gBACzB,GAAG,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;gBACvD,OAAO;aACV;YACD,UAAU,GAAG,eAAe,CAAC,KAAK,CAAA;YAClC,IAAI,UAAU,IAAI,EAAE,IAAI,UAAU,IAAI,IAAI,EAAE;gBACxC,mCAAmC;gBACnC,+CAA+C;gBAC/C,GAAG,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBACzC,OAAO;aACV;YACD,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;SAEtE;QACD,qDAAqD;aAChD,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE;YAC1B,IAAI,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAQ,CAAC;YAChE,IAAG,IAAI,IAAI,IAAI,EACf;gBACI,GAAG,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;gBACvD,OAAO;aACV;YACD,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC;YACxB,IAAI,UAAU,IAAI,EAAE,IAAI,UAAU,IAAI,IAAI,EAAE;gBACxC,0CAA0C;gBAC1C,sDAAsD;gBACtD,GAAG,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBACzC,OAAO;aACV;YACD,yCAAyC;YACzC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC;YAC1D,yCAAyC;YACzC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC;YACpD,yCAAyC;YACzC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;SACtB;QACD,4DAA4D;QAC5D,IAAI,IAAI,GAAG,EAAE,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAgB,CAAC;QACvE,IAAI,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;QAC9B,yCAAyC;QACzC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC/D,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QACxD,0CAA0C;QAC1C,cAAc,CAAC,OAAO,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QACjD,EAAE,CAAC,SAAS,IAAI,SAAS,CAAC;IAC9B,CAAC;CAEJ;AA9FD,4BA8FC;;;;;;;ACxGD,MAAa,mBAAmB;CAI/B;AAJD,kDAIC;;;;;ACJD,MAAa,oBAAoB;CAOhC;AAPD,oDAOC","file":"generated.js","sourceRoot":"","sourcesContent":["(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c=\"function\"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error(\"Cannot find module '\"+i+\"'\");throw a.code=\"MODULE_NOT_FOUND\",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u=\"function\"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()","import { Controller } from \"./AbstractController\";\nimport \"../model/AbstractModel\"\nimport \"../model/UserModel\"\nimport \"../view/AbstractView\"\nimport \"../view/UserView\"\nimport { Model } from \"../model/AbstractModel\";\nimport { View } from \"../view/AbstractView\";\nimport { ChatMessageViewModel } from \"../viewmodel/ChatMessageViewModel\";\nimport { ChatModel } from \"../model/ChatModel\";\nimport { ChatView } from \"../view/ChatView\";\n\nexport class ChatController {\n    private _model: ChatModel;\n    private _view: ChatView;\n\n\n    constructor(model: ChatModel, view: ChatView) {\n        this._model = model;\n        this._view = view;\n    }\n\n\n    /**\n     * eventHandler\n     */\n    public eventHandler(vm: ChatMessageViewModel[]): void {\n        this._model.someBusinessMethod(vm);\n    }\n\n    public test(): void {\n        const chatMessageViewModels: ChatMessageViewModel[] = [];\n        let chatMessageViewModelMock = new ChatMessageViewModel();\n        chatMessageViewModelMock.fromUser = \"user1\";\n        chatMessageViewModelMock.toUser = \"user2\";\n        chatMessageViewModelMock.message = \"\";\n        chatMessageViewModelMock.messageTime = new Date();\n        chatMessageViewModels.push(chatMessageViewModelMock);\n    }\n\n    \n}","import { Controller } from \"./AbstractController\";\nimport \"../model/AbstractModel\"\nimport \"../model/UserModel\"\nimport \"../view/AbstractView\"\nimport \"../view/UserView\"\nimport { Model } from \"../model/AbstractModel\";\nimport { View } from \"../view/AbstractView\";\nimport { ActiveUserViewModel } from \"../viewmodel/ActiveUserViewModel\";\nimport { UserView } from \"../view/UserView\";\n\nexport class UserController {\n    private _model: Model;\n    private _view: UserView;\n\n\n    constructor(model: Model, view: UserView) {\n        this._model = model;\n        this._view = view;\n    }\n\n\n    /**\n     * eventHandler\n     */\n    public eventHandler(vm: ActiveUserViewModel[]): void {\n        this._model.someBusinessMethod(vm);\n    }\n\n    public test(): void {\n        const activeUsersMock: ActiveUserViewModel[] = [];\n        let activeUserViewModelMock = new ActiveUserViewModel();\n        activeUserViewModelMock.userName = \"some user\";\n        activeUserViewModelMock.lastActive = \"3 hrs ago\";\n        activeUserViewModelMock.online = true;\n        activeUsersMock.push(activeUserViewModelMock);\n        activeUserViewModelMock = new ActiveUserViewModel();\n        activeUserViewModelMock.lastActive = \"3 hrs ago\";\n        activeUserViewModelMock.online = true;\n        activeUserViewModelMock.userName = \"some user 2\";\n        activeUsersMock.push(activeUserViewModelMock);\n        this.eventHandler(activeUsersMock);\n    }\n\n    \n}","import { Controller } from \"./controller/AbstractController\";\nimport { UserModel } from \"./model/UserModel\"\nimport { Model } from \"./model/AbstractModel\";\nimport { View } from \"./view/AbstractView\";\nimport { UserView } from \"./view/UserView\";\nimport { UserController } from \"./controller/UserController\";\nimport { ModelFactory } from \"./model/ModelFactory\";\nimport { ActiveUserViewModel } from \"./viewmodel/ActiveUserViewModel\";\nimport { ChatMessageViewModel } from \"./viewmodel/ChatMessageViewModel\";\nimport * as Handlebars from \"handlebars\";\nimport markdownit = require('markdown-it');\nimport { ChatModel } from \"./model/ChatModel\";\nimport { ChatView } from \"./view/ChatView\";\nimport { ChatController } from \"./controller/ChatController\";\nimport { JsonAPI } from \"./singleton/JsonAPI\";\n// import log = require('loglevel')\nimport * as log from 'loglevel';\n// import log from 'loglevel';\nimport { EncryptionService } from \"./service/EncryptionService\";\nimport { SJCLEncryptionService } from \"./service/SJCLEncryptionService\";\n// var markdownit = require('markdown-it');\nvar md = new markdownit();\n\n\nconst userBox = document.getElementById('contacts-box');\n\nlog.setLevel(\"TRACE\")\n\nconst chatModel = new ChatModel();\n\nconst userModel = new UserModel();\n// const userModel = ModelFactory.createModel(\"USER\");\n// @ts-ignore: Argument of type 'HTMLElement | null' is not assignable to parameter of type 'HTMLElement'. Type 'null' is not assignable to type 'HTMLElement'.\nconst userView = new UserView(userModel, chatModel, userBox);\n\n// console.log(userBox);\n\nuserModel.attach(userView);\n// userView.model\n\n\nconst userController = new UserController(userModel, userView);\nuserController.test();\n\n\n\n// userModel.someBusinessMethod(activeUsersMock);\nlog.info(\"hello\");\n\nconst chatArea = document.getElementById('chat-area-new');\n// @ts-ignore: Argument of type 'HTMLElement | null' is not assignable to parameter of type 'HTMLElement'. Type 'null' is not assignable to type 'HTMLElement'.\nconst chatView = new ChatView(chatModel, chatArea);\nconst chatController = new ChatController(chatModel, chatView);\n\n\nfunction someFunc(vm: ActiveUserViewModel): void {\n    // log.info(vm);\n    // logger.info(vm)\n}\n\nlog.info(\"test\");\n// someFunc(activeUserViewModelMock);\n\n// @ts-ignore: Object is possibly 'null'.\nvar source = document.getElementById(\"msg_container_template\").innerHTML;\n\nvar msgContainerTemplate = Handlebars.compile(source);\n\nJsonAPI.ACTIVE_USERS_GET + 'aef';\n\nconst encryptionService: EncryptionService = new SJCLEncryptionService();\nlet ct = encryptionService.encrypt(\"password\",\"data\");\nconsole.log(encryptionService.decrypt(\"password\", ct));\n\nHandlebars.registerHelper('avatar', function() {\n    return '<div class=\"img_cont_msg\"> <img src=\"https://static.turbosquid.com/Preview/001292/481/WV/_D.jpg\" class=\"rounded-circle user_img_msg\"> </div>';\n});","import { Subject } from \"../observe/Observable\";\nimport { Model } from \"./AbstractModel\";\nimport { Observer } from \"../observe/Observer\";\nimport { fetchErrorHandler } from \"./FetchErrorHandler\";\nimport { ActiveUserViewModel } from \"../viewmodel/ActiveUserViewModel\";\nimport { ChatMessageViewModel } from \"../viewmodel/ChatMessageViewModel\";\nimport { JsonAPI } from \"../singleton/JsonAPI\";\nimport log = require('loglevel');\nimport { EncryptionService } from \"../service/EncryptionService\";\nimport { SJCLEncryptionService } from \"../service/SJCLEncryptionService\";\nimport { ChatMessageDTO } from \"../dto/ChatMessageDTO\";\nimport { ChatModelHelper } from \"./ChatModelHelper\";\n\nexport class ChatModel implements Subject {\n    /**\n  * @type {Observer[]} List of subscribers. In real life, the list of\n  * subscribers can be stored more comprehensively (categorized by event\n  * type, etc.).\n  */\n    private readonly _observers: Observer[] = [];\n    private state: ChatMessageViewModel[] | null;\n    private readonly _messagesMap: Map<string, ChatMessageViewModel[]>;\n\n    constructor() {\n        this.state = null;\n        this._messagesMap = new Map();\n    }\n    /**\n     * The subscription management methods.\n     */\n    public attach(observer: Observer): void {\n        console.log('Subject: Attached an observer.');\n        this._observers.push(observer);\n    }\n\n    public detach(observer: Observer): void {\n        const observerIndex = this._observers.indexOf(observer);\n        this._observers.splice(observerIndex, 1);\n        console.log('Subject: Detached an observer.');\n    }\n\n    public setUserMessages(username: string, messages: ChatMessageViewModel[]) {\n        this._messagesMap.set(username, messages);\n    }\n\n    /**\n     * Trigger an update in each subscriber.\n     */\n    public notify(): void {\n        console.log('Subject: Notifying observers...');\n        for (const observer of this._observers) {\n            observer.update(this.state);\n        }\n    }\n\n    public someBusinessMethod(chatMessageList: ChatMessageViewModel[]): void {\n        this.state = chatMessageList;\n        this.helperMethod();\n        console.log(`Subject: My state has just changed`);\n        console.log(chatMessageList);\n        this.notify();\n    }\n\n    public getmessages(userName: string, passphrase: string, lastMessageTime: string | null): void {\n        const cVMs = ChatModelHelper.getMessages(userName, passphrase, lastMessageTime, this);\n        if (cVMs != null) {\n            log.info('Subject: My state has just changed')\n            log.debug(cVMs);\n            this._messagesMap.set(userName, cVMs);\n            this.notify();\n        }\n        else {\n            log.error('Messages were null');\n        }\n    }\n\n\n\n    private helperMethod() { }\n\n    public populateMessages(): void {\n\n    }\n\n\n\n}","import { ChatMessageDTO } from \"../dto/ChatMessageDTO\";\n\nimport * as log from \"loglevel\";\n\nimport { ChatMessageViewModel } from \"../viewmodel/ChatMessageViewModel\";\n\nimport { JsonAPI } from \"../singleton/JsonAPI\";\n\nimport { fetchErrorHandler } from \"./FetchErrorHandler\";\n\nimport { EncryptionService } from \"../service/EncryptionService\";\nimport { SJCLEncryptionService } from \"../service/SJCLEncryptionService\";\nimport { ChatModel } from \"./ChatModel\";\n\nexport class ChatModelHelper {\n    private static readonly encryptionService = new SJCLEncryptionService();\n\n    public static getMessages(userName: string, passphrase: string, lastMessageTime: string | null, chatModel: ChatModel): ChatMessageViewModel[] | null {\n        switch (lastMessageTime) {\n            case null: {\n                this.getAllMessagesAjax(userName)\n                    .then((data: ChatMessageDTO[]) => {\n                        log.debug(`Subject: received all messages`);\n                        // let userNames = data.map(ChatMessageViewModel => ChatMessageViewModel.fromUser)\n                        // let sumt = data.map(chatMessageViewModel => { return this.encryptionService.decrypt(passphrase, chatMessageViewModel.messageCipher) });\n                        return data.map(vm => this.toChatMessageVM(vm, passphrase));\n                        // chatModel.setUserMessages(userName, chatMessageVMs);\n                        // chatModel.notify();\n                    })\n                break;\n            }\n            default: {\n                this.getNewMessagesAjax(userName, lastMessageTime)\n                    .then((data: ChatMessageDTO[]) => {\n                        log.debug(`Subject: received new messages`);\n                        return data.map(vm => this.toChatMessageVM(vm, passphrase));\n                        // chatModel.setUserMessages(userName, chatMessageVMs);\n                        // this.state = data;\n                        // chatModel.notify();\n                    })\n                break;\n            }\n        }\n\n        return null;\n    }\n\n    private static toChatMessageVM(chatMessageDTO: ChatMessageDTO, passphrase: string): ChatMessageViewModel {\n        const vm = new ChatMessageViewModel();\n        vm.fromUser = chatMessageDTO.fromUser;\n        vm.toUser = chatMessageDTO.toUser;\n        vm.messageTime = chatMessageDTO.messageTime;\n        vm.message = this.encryptionService.decrypt(passphrase, chatMessageDTO.messageCipher) as string;\n        return vm;\n    }\n\n    private static async getAllMessagesAjax(toUser: string): Promise<any> {\n        let headers = new Headers();\n        if (JsonAPI.authToken == null) {\n            log.error(\"authToken null\");\n            return;\n        };\n        headers.append('X-AUTH-TOKEN', JsonAPI.authToken);\n        let response = await fetch(`${JsonAPI.CHAT_MESSAGES_GET}/${toUser}`, {\n            method: 'GET',\n            headers: headers\n        });\n        console.log(response.clone());\n        if (fetchErrorHandler(response.clone())) {\n            return null;\n        }\n        let data: Promise<any> = await response.json();\n        return data;\n    }\n\n    private static async getNewMessagesAjax(toUser: string, lastMessageTimeStamp: string): Promise<any> {\n        let headers = new Headers();\n        if (JsonAPI.authToken == null) {\n            log.error(\"authToken null\");\n            return;\n        };\n        headers.append('X-AUTH-TOKEN', JsonAPI.authToken);\n        let response = await fetch(`${JsonAPI.CHAT_MESSAGES_GET}/${toUser}/${lastMessageTimeStamp}`, {\n            method: 'GET',\n            headers: headers\n        });\n        console.log(response.clone());\n        if (fetchErrorHandler(response.clone())) {\n            return null;\n        }\n        let data: Promise<any> = await response.json();\n        return data;\n    }\n}","export function fetchErrorHandler(response: Response) {\n    // alertify.success('Current position : ' + alertify.get('notifier', 'position'));\n    if (!response.ok) {\n        return response.text().catch(err => {\n            // the status was not ok and there is no json body\n            // throw new Error(response.statusText);\n            // window.alert(sprintf('Some error occured. Http code is %s', response.status));\n            // alertify.error(sprintf('Some error occured. Http code is %s', response.status));\n            return true;\n        }).then(json => {\n            // the status was not ok but there is a json body\n            // throw new Error(json.error.message); // example error message returned by a REST API\n            // window.alert(sprintf('Error: %s (Http code %s)', json, response.status));\n            // alertify.error(sprintf('Some error occured. Http code is %s', response.status));\n            console.log(json);\n            return true;\n        });\n    }\n}","import { Subject } from \"../observe/Observable\";\nimport { Model } from \"./AbstractModel\";\nimport { Observer } from \"../observe/Observer\";\nimport { fetchErrorHandler } from \"./FetchErrorHandler\";\nimport { ActiveUserViewModel } from \"../viewmodel/ActiveUserViewModel\";\nimport { JsonAPI } from \"../singleton/JsonAPI\";\nimport { ChatMessageViewModel } from \"../viewmodel/ChatMessageViewModel\";\n\nexport class UserModel implements Subject {\n    /**\n  * @type {Observer[]} List of subscribers. In real life, the list of\n  * subscribers can be stored more comprehensively (categorized by event\n  * type, etc.).\n  */\n    private readonly observers: Observer[] = [];\n    private state: ActiveUserViewModel[] | undefined;\n    // @ts-ignore: Cannot find name 'hostAddress'.\n\n    constructor() { }\n    /**\n     * The subscription management methods.\n     */\n    public attach(observer: Observer): void {\n        console.log('Subject: Attached an observer.');\n        this.observers.push(observer);\n    }\n\n    public detach(observer: Observer): void {\n        const observerIndex = this.observers.indexOf(observer);\n        this.observers.splice(observerIndex, 1);\n        console.log('Subject: Detached an observer.');\n    }\n\n    /**\n     * Trigger an update in each subscriber.\n     */\n    public notify(): void {\n        console.log('Subject: Notifying observers...');\n        for (const observer of this.observers) {\n            observer.update(this.state);\n        }\n    }\n\n    public someBusinessMethod(activeuserList: ActiveUserViewModel[]): void {\n        this.state = activeuserList;\n        this.helperMethod();\n        console.log(`Subject: My state has just changed`);\n        console.log(activeuserList);\n        this.notify();\n    }\n\n    /**\n     * getActiveUsers\n     */\n    public getActiveUsers(): void {\n        this.getActiveUsersAjax(\"\", JsonAPI.ACTIVE_USERS_GET)\n            .then(data => {\n                // // activeUsers = data;\n                // sessionStorage.setItem('activeUsers', JSON.stringify(data));\n                // console.log(sessionStorage.getItem('activeUsers'));\n                console.log(`Subject: received ajax active users`);\n                this.state = data;\n                this.notify();\n            })\n    }\n\n    async getActiveUsersAjax(authToken2: string, URL: string): Promise<any> {\n        let headers = new Headers();\n        // headers.append('Authorization', basicAuthToken);\n        headers.append('X-AUTH-TOKEN', authToken2);\n        let response = await fetch(JsonAPI.ACTIVE_USERS_GET, {\n            method: 'GET',\n            headers: headers\n        });\n        console.log(response.clone());\n        if (fetchErrorHandler(response.clone())) {\n            return null;\n        }\n        let data = await response.json();\n        // return data;\n        return new Promise((resolve, reject) => {\n            if (data != null)\n                resolve(data)\n            else\n                reject('Response data null')\n        })\n    }\n\n    private helperMethod() { }\n\n}","import { EncryptionService } from \"./EncryptionService\";\nimport * as sjcl from \"sjcl\";\n\nexport class SJCLEncryptionService implements EncryptionService {\n    private readonly params: any = { mode: \"gcm\", ts: 128, adata: \"\", iter: 10000}\n    public encrypt(passphrase: string, plainText: string): Object {\n        return sjcl.encrypt(passphrase, plainText, this.params);\n    } \n    \n    public decrypt(passphrase: string, cipher: Object): Object {\n        return sjcl.decrypt(passphrase, cipher as sjcl.SjclCipherEncrypted, undefined, undefined);\n    }\n}","export namespace JsonAPI {\n    // @ts-ignore: Cannot find name 'hostAddress'.\n    export let userName: string | null = localStorage.getItem('userName');\n    export let authToken: string | null = localStorage.getItem('authToken');\n    export const ACTIVE_USERS_GET = `/api/chat/get/active-users`;\n    export const CHAT_MESSAGES_GET = ``;\n    \n}","export class TemplateFactory {\n    // static getTemplate(templateName: string): Handlebars.TemplateDelegate<any> {\n\n    //     switch (templateName) {\n    //         case \"user-contact-online-template\": {\n    //             // let source = document.getElementById(\"user-contact-online-template\").innerHTML;\n    //             // let msgContainerTemplate = Handlebars.compile(source);\n    //             // return msgContainerTemplate;\n    //             return this.createTemplate(templateName);\n    //         }\n    //         case \"msg_container_send_template\": {\n    //             // let source = document.getElementById(\"msg_container_send_template\").innerHTML;\n    //             // let msgContainerTemplate = Handlebars.compile(source);\n    //             // return msgContainerTemplate;\n    //             return this.createTemplate(templateName);\n    //         }\n    //         case \"msg_container_template\": {\n    //             // let source = document.getElementById(\"msg_container_send_template\").innerHTML;\n    //             // let msgContainerTemplate = Handlebars.compile(source);\n    //             // return msgContainerTemplate;\n    //             return this.createTemplate(templateName);\n    //         }\n    //         default:\n    //             throw new Error('invalid template name');\n    //     }\n    // }\n\n    static getTemplate(templateName: string): Handlebars.TemplateDelegate<any> {\n        //@ts-ignore: Object is possibly 'null'.\n        let source = document.getElementById(templateName).innerHTML;\n        let msgContainerTemplate = Handlebars.compile(source);\n        return msgContainerTemplate;\n    }\n}","import { Observer } from \"../observe/Observer\";\nimport { Model } from \"../model/AbstractModel\";\nimport { Subject } from \"../observe/Observable\";\nimport { View } from \"./AbstractView\";\nimport { Controller } from \"../controller/AbstractController\";\nimport { TemplateFactory } from \"../template/TemplateFactory\";\nimport { ActiveUserViewModel } from \"../viewmodel/ActiveUserViewModel\";\nimport { ChatModel } from \"../model/ChatModel\";\nimport { ChatMessageViewModel } from \"../viewmodel/ChatMessageViewModel\";\nimport * as log from 'loglevel';\n\nexport class ChatView implements Observer {\n    private readonly _model: ChatModel;\n    private readonly _element: HTMLElement;\n    private readonly _messageSendTemplate = TemplateFactory.getTemplate('msg_container_send_template');\n\n\n    constructor(model: ChatModel, element: HTMLElement) {\n        this._model = model;\n        this._element = element;\n    }\n\n\n    update(data: ChatMessageViewModel[]): void {\n        let html: string = \"\";\n        data.forEach((vm: ChatMessageViewModel) => {\n            html += this._messageSendTemplate(vm);\n        });\n        this._element.innerHTML = html;\n        log.debug(this._element.innerHTML);\n    }\n}","import { Observer } from \"../observe/Observer\";\nimport { Model } from \"../model/AbstractModel\";\nimport { Subject } from \"../observe/Observable\";\nimport { View } from \"./AbstractView\";\nimport { Controller } from \"../controller/AbstractController\";\nimport { TemplateFactory } from \"../template/TemplateFactory\";\nimport { ActiveUserViewModel } from \"../viewmodel/ActiveUserViewModel\";\nimport { ChatModel } from \"../model/ChatModel\";\nimport log = require(\"loglevel\");\n\nexport class UserView implements Observer {\n    private readonly _model: Model;\n    private readonly _chatModel: ChatModel;\n    private readonly _element: HTMLElement;\n    // private userBoxes: any[] =  [];\n\n\n    constructor(model: Model, chatModel: ChatModel, element: HTMLElement) {\n        this._model = model;\n        this._chatModel = chatModel;\n        this._element = element;\n    }\n\n\n\n\n    update(data: ActiveUserViewModel[]): void {\n        let template = TemplateFactory.getTemplate('user-contact-online-template');\n        let html: string = \"\";\n        data.forEach((element: ActiveUserViewModel) => {\n            html += template(element);\n        });\n        this._element.innerHTML = html;\n        this.addUserCallBacks();\n        console.log(this._element.innerHTML);\n    }\n\n    private helper(): void {\n\n    }\n\n    private addUserCallBacks(): void {\n        let userBoxes = document.getElementsByClassName('user-box');\n        for (let i = 0; i < userBoxes.length; i++) {\n            let userBox = userBoxes[i];\n            userBoxes[i].addEventListener('click', this.userCallBack.bind(this, userBox));\n        }\n    }\n\n\n    private userCallBack(el: Element): void {\n        let current = document.getElementsByClassName('user-box active');\n\n        let passphrase: string = '';\n        if (current.length > 0) {\n            let passphraseInput = document.getElementById('passphrase') as any;\n\n            if (passphraseInput == null) {\n                log.error('passphraseInput element reference is null');\n                return;\n            }\n            passphrase = passphraseInput.value\n            if (passphrase == '' || passphrase == null) {\n                // alert('Please input passphrase')\n                // alertify.error('Please enter a passphrase');\n                log.error('passphrase is empty or null');\n                return;\n            }\n            current[0].className = current[0].className.replace(\" active\", \"\");\n\n        }\n        // Add the active class to the current/clicked button\n        else if (current.length == 0) {\n            let elem = document.getElementById('passphrase-initial') as any;\n            if(elem == null)\n            {\n                log.error('passphraseInput element reference is null');\n                return;\n            }\n            passphrase = elem.value;\n            if (passphrase == '' || passphrase == null) {\n                //     // alert('Please input passphrase')\n                //     // alertify.error('Please enter a passphrase');\n                log.error('passphrase is empty or null');\n                return;\n            }\n            // @ts-ignore: Object is possibly 'null'.\n            document.getElementById('no-user-selected').hidden = true;\n            // @ts-ignore: Object is possibly 'null'.\n            document.getElementById('chat-card').hidden = false;\n            // @ts-ignore: Object is possibly 'null'.\n            elem.hidden = true;\n        }\n        // console.log(this.getElementsByClassName('to-user-span'));\n        let elem = el.getElementsByClassName('to-user-span')[0] as HTMLElement;\n        let userName = elem.innerText;\n        // @ts-ignore: Object is possibly 'null'.\n        document.getElementById('user-name-span').innerText = userName;\n        this._chatModel.getmessages(userName, passphrase, null);\n        // populateMessages(userName, passphrase);\n        sessionStorage.setItem('selectedUser', userName);\n        el.className += \" active\";\n    }\n\n}","export class ActiveUserViewModel {\n    userName: string | undefined;\n    online: boolean | undefined;\n    lastActive: string| undefined;\n}","export class ChatMessageViewModel {\n    public toUser: string | undefined;\n    public fromUser: string | undefined;\n    public message!: string;\n    public messageTime!: Date;\n\n    \n}"]} diff --git a/chatto/src/main/javascript/package.json b/chatto/src/main/javascript/package.json index 27e7d12..61f69ee 100644 --- a/chatto/src/main/javascript/package.json +++ b/chatto/src/main/javascript/package.json @@ -24,8 +24,10 @@ "browserify-shim": "^3.8.14", "grunt": "^1.0.4", "grunt-browserify": "^5.3.0", + "grunt-terser": "^1.0.0", "tsify": "^4.0.1", - "typescript": "^3.7.4" + "typescript": "^3.7.4", + "uglify-js": "^3.7.5" }, "browserify": { "transform": [ diff --git a/chatto/src/main/javascript/ts/tsconfig.json b/chatto/src/main/javascript/ts/tsconfig.json index 53ad2ef..c15a0ba 100644 --- a/chatto/src/main/javascript/ts/tsconfig.json +++ b/chatto/src/main/javascript/ts/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { /* Basic Options */ // "incremental": true, /* Enable incremental compilation */ - "target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */ + "target": "ES2017", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */ "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */ // "lib": [ "ES2015" ], // "lib": [], /* Specify library files to be included in the compilation. */ diff --git a/chatto/src/main/javascript/yarn.lock b/chatto/src/main/javascript/yarn.lock index 788fd04..94804e6 100644 --- a/chatto/src/main/javascript/yarn.lock +++ b/chatto/src/main/javascript/yarn.lock @@ -112,16 +112,6 @@ amdefine@>=0.0.4: resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= - ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -147,19 +137,6 @@ ap@~0.2.0: resolved "https://registry.yarnpkg.com/ap/-/ap-0.2.0.tgz#ae0942600b29912f0d2b14ec60c45e8f330b6110" integrity sha1-rglCYAspkS8NKxTsYMRejzMLYRA= -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== - -are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -598,11 +575,6 @@ chokidar@^2.1.1: optionalDependencies: fsevents "^1.2.7" -chownr@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142" - integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw== - cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" @@ -628,11 +600,6 @@ clean-css@^4.1.5: dependencies: source-map "~0.6.0" -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - coffeescript@~1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.10.0.tgz#e7aa8301917ef621b35d8a39f348dcdd1db7e33e" @@ -678,7 +645,7 @@ combine-source-map@^0.8.0, combine-source-map@~0.8.0: lodash.memoize "~3.0.3" source-map "~0.5.3" -commander@~2.20.3: +commander@^2.20.0, commander@~2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -708,11 +675,6 @@ console-browserify@^1.1.0: resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - constants-browserify@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -825,13 +787,6 @@ debug@^2.2.0, debug@^2.3.3: dependencies: ms "2.0.0" -debug@^3.2.6: - version "3.2.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" - integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== - dependencies: - ms "^2.1.1" - decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -842,11 +797,6 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" @@ -874,11 +824,6 @@ defined@^1.0.0: resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - deps-sort@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.1.tgz#9dfdc876d2bcec3386b6829ac52162cda9fa208d" @@ -902,11 +847,6 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detective@^4.5.0: version "4.7.1" resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e" @@ -1187,13 +1127,6 @@ fragment-cache@^0.2.1: dependencies: map-cache "^0.2.2" -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -1217,20 +1150,6 @@ fuse.js@^3.4.6: resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.4.6.tgz#545c3411fed88bf2e27c457cab6e73e7af697a45" integrity sha512-H6aJY4UpLFwxj1+5nAvufom5b2BT2v45P1MkPvdGIK8fWjQx/7o6tTT1+ALV0yawQvbmvCF0ufl2et8eJ7v7Cg== -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - get-assigned-identifiers@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz#6dbf411de648cbaf8d9169ebb0d2d576191e2ff1" @@ -1395,6 +1314,13 @@ grunt-legacy-util@~1.1.1: underscore.string "~3.3.4" which "~1.3.0" +grunt-terser@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/grunt-terser/-/grunt-terser-1.0.0.tgz#cb46d645fe51ec9b3bcb1f37dbd2f3112d91e791" + integrity sha512-8MfNU3cVP4UWZLlIjJMUpk3NWIEmaD+CwewhDpUTiPaS49EkBiSWCmGAihqWxBKbiOC3KePPXMmB/yiaVNqW2w== + dependencies: + terser "^4.3.9" + grunt@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.0.4.tgz#c799883945a53a3d07622e0737c8f70bfe19eb38" @@ -1441,11 +1367,6 @@ has-require@~1.2.1: dependencies: escape-string-regexp "^1.0.3" -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -1536,7 +1457,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -1548,13 +1469,6 @@ ieee754@^1.1.4: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== -ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== - dependencies: - minimatch "^3.0.4" - indent-string@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" @@ -1585,7 +1499,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.4, ini@~1.3.0: +ini@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -1705,18 +1619,6 @@ is-finite@^1.0.0: dependencies: number-is-nan "^1.0.0" -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= - is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" @@ -2014,7 +1916,7 @@ minimist@0.0.8: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= -minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: +minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= @@ -2024,21 +1926,6 @@ minimist@~0.0.1: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -2047,7 +1934,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: +mkdirp@^0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= @@ -2092,11 +1979,6 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= -ms@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - nan@^2.12.1: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" @@ -2119,44 +2001,11 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -needle@^2.2.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" - integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - neo-async@^2.6.0: version "2.6.1" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= - dependencies: - abbrev "1" - osenv "^0.1.4" - nopt@~3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" @@ -2186,36 +2035,6 @@ normalize-path@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -npm-bundled@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" - integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== - dependencies: - npm-normalize-package-bin "^1.0.1" - -npm-normalize-package-bin@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" - integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - -npm-packlist@^1.1.6: - version "1.4.7" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" - integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - -npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" @@ -2274,24 +2093,6 @@ os-browserify@~0.3.0: resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= - -os-tmpdir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - outpipe@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/outpipe/-/outpipe-1.1.1.tgz#50cf8616365e87e031e29a5ec9339a3da4725fa2" @@ -2481,16 +2282,6 @@ randomfill@^1.0.3: randombytes "^2.0.5" safe-buffer "^5.1.0" -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - read-only-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0" @@ -2528,19 +2319,6 @@ readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@~2.3.6: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^2.0.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - readable-stream@^3.0.6: version "3.4.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc" @@ -2676,13 +2454,6 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -rimraf@^2.6.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - rimraf@~2.6.2: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" @@ -2720,21 +2491,11 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - set-value@^2.0.0, set-value@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" @@ -2829,6 +2590,14 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: source-map-url "^0.4.0" urix "^0.1.0" +source-map-support@~0.5.12: + version "0.5.16" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" + integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" @@ -2839,7 +2608,7 @@ source-map@^0.5.6, source-map@~0.5.3: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= -source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== @@ -2936,23 +2705,6 @@ stream-splicer@^2.0.0: inherits "^2.0.1" readable-stream "^2.0.2" -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2": - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -2972,20 +2724,6 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= - dependencies: - ansi-regex "^3.0.0" - strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" @@ -3007,7 +2745,7 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" -strip-json-comments@^2.0.0, strip-json-comments@~2.0.1: +strip-json-comments@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= @@ -3033,24 +2771,20 @@ syntax-error@^1.1.1: dependencies: acorn-node "^1.2.0" -tar@^4.4.2: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - ternary@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ternary/-/ternary-1.0.0.tgz#45702725608c9499d46a9610e9b0e49ff26f789e" integrity sha1-RXAnJWCMlJnUapYQ6bDkn/JveJ4= +terser@^4.3.9: + version "4.6.3" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz#e33aa42461ced5238d352d2df2a67f21921f8d87" + integrity sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ== + dependencies: + commander "^2.20.0" + source-map "~0.6.1" + source-map-support "~0.5.12" + through2@2.0.x, through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -3166,6 +2900,14 @@ uglify-js@^3.1.4: commander "~2.20.3" source-map "~0.6.1" +uglify-js@^3.7.5: + version "3.7.5" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.5.tgz#278c7c24927ac5a32d3336fc68fd4ae1177a486a" + integrity sha512-GFZ3EXRptKGvb/C1Sq6nO1iI7AGcjyqmIyOw0DrD0675e+NNbGO72xmMM2iEBdFbxaTLo70NbjM/Wy54uZIlsg== + dependencies: + commander "~2.20.3" + source-map "~0.6.1" + umd@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf" @@ -3283,13 +3025,6 @@ which@^1.2.14, which@~1.3.0: dependencies: isexe "^2.0.0" -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== - dependencies: - string-width "^1.0.2 || 2" - wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" @@ -3311,8 +3046,3 @@ xtend@~2.1.1: integrity sha1-bv7MKk2tjmlixJAbM3znuoe10os= dependencies: object-keys "~0.4.0" - -yallist@^3.0.0, yallist@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" - integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==