From 5d20bee4c1fd75267d9159346c0d8a4ce8c7b036 Mon Sep 17 00:00:00 2001 From: Martin Battaglino Date: Wed, 26 Jun 2019 12:16:55 -0300 Subject: [PATCH 1/4] Move botskills cli tool to the tools root folder --- {lib/typescript => tools}/botskills/.gitignore | 0 {lib/typescript => tools}/botskills/.nycrc | 0 {lib/typescript => tools}/botskills/README.md | 0 {lib/typescript => tools}/botskills/docs/connect-disconnect.md | 0 {lib/typescript => tools}/botskills/docs/list.md | 0 {lib/typescript => tools}/botskills/docs/refresh.md | 0 {lib/typescript => tools}/botskills/docs/update.md | 0 {lib/typescript => tools}/botskills/package-lock.json | 0 {lib/typescript => tools}/botskills/package.json | 0 {lib/typescript => tools}/botskills/src/botskills-connect.ts | 0 {lib/typescript => tools}/botskills/src/botskills-disconnect.ts | 0 {lib/typescript => tools}/botskills/src/botskills-list.ts | 0 {lib/typescript => tools}/botskills/src/botskills-refresh.ts | 0 {lib/typescript => tools}/botskills/src/botskills-update.ts | 0 {lib/typescript => tools}/botskills/src/botskills.ts | 0 .../botskills/src/functionality/connectSkill.ts | 0 .../botskills/src/functionality/disconnectSkill.ts | 0 {lib/typescript => tools}/botskills/src/functionality/index.ts | 0 .../typescript => tools}/botskills/src/functionality/listSkill.ts | 0 .../botskills/src/functionality/refreshSkill.ts | 0 .../botskills/src/functionality/updateSkill.ts | 0 {lib/typescript => tools}/botskills/src/index.ts | 0 {lib/typescript => tools}/botskills/src/logger/index.ts | 0 {lib/typescript => tools}/botskills/src/logger/logger.ts | 0 {lib/typescript => tools}/botskills/src/models/authentication.ts | 0 {lib/typescript => tools}/botskills/src/models/cognitiveFile.ts | 0 .../botskills/src/models/connectConfiguration.ts | 0 .../botskills/src/models/disconnectConfiguration.ts | 0 {lib/typescript => tools}/botskills/src/models/dispatchFile.ts | 0 {lib/typescript => tools}/botskills/src/models/index.ts | 0 .../botskills/src/models/listConfiguration.ts | 0 .../botskills/src/models/refreshConfiguration.ts | 0 {lib/typescript => tools}/botskills/src/models/skillFile.ts | 0 {lib/typescript => tools}/botskills/src/models/skillManifest.ts | 0 .../botskills/src/models/updateConfiguration.ts | 0 .../botskills/src/utils/authenticationUtils.ts | 0 .../typescript => tools}/botskills/src/utils/childProcessUtils.ts | 0 {lib/typescript => tools}/botskills/src/utils/index.ts | 0 {lib/typescript => tools}/botskills/src/utils/validationUtils.ts | 0 {lib/typescript => tools}/botskills/test/connect.test.js | 0 {lib/typescript => tools}/botskills/test/disconnect.test.js | 0 {lib/typescript => tools}/botskills/test/helpers/testLogger.js | 0 {lib/typescript => tools}/botskills/test/list.test.js | 0 {lib/typescript => tools}/botskills/test/mocha.opts | 0 .../botskills/test/mocks/resources/absentSkill.json | 0 .../botskills/test/mocks/resources/badSkillsArray.jso | 0 .../botskills/test/mocks/resources/connectableSkill.json | 0 .../test/mocks/resources/dispatchFolder/connectableSkill.dispatch | 0 .../botskills/test/mocks/resources/emptyDispatch.dispatch | 0 .../botskills/test/mocks/resources/emptySkillsArray.json | 0 .../botskills/test/mocks/resources/filledDispatch.dispatch | 0 .../botskills/test/mocks/resources/filledDispatch.json | 0 .../botskills/test/mocks/resources/filledDispatchNoJson.dispatch | 0 .../botskills/test/mocks/resources/filledSkillsArray.json | 0 .../botskills/test/mocks/resources/invalidSkill.json | 0 .../botskills/test/mocks/resources/invalidSkillid.json | 0 .../botskills/test/mocks/resources/luFolder/connectableSkill.lu | 0 .../botskills/test/mocks/resources/luisFolder/connectableSkill.lu | 0 .../test/mocks/resources/luisFolder/connectableSkill.luis | 0 .../resources/successfulConnectFiles/connectableSkill.dispatch | 0 .../mocks/resources/successfulConnectFiles/connectableSkill.json | 0 .../mocks/resources/successfulConnectFiles/connectableSkill.lu | 0 .../mocks/resources/successfulConnectFiles/connectableSkill.luis | 0 .../mocks/resources/successfulConnectFiles/filledSkillsArray.json | 0 .../botskills/test/mocks/resources/testSkill.json | 0 .../botskills/test/mocks/resources/undefinedSkillsArray.json | 0 {lib/typescript => tools}/botskills/test/refresh.test.js | 0 {lib/typescript => tools}/botskills/test/update.test.js | 0 {lib/typescript => tools}/botskills/tsconfig.json | 0 {lib/typescript => tools}/botskills/tslint.json | 0 70 files changed, 0 insertions(+), 0 deletions(-) rename {lib/typescript => tools}/botskills/.gitignore (100%) rename {lib/typescript => tools}/botskills/.nycrc (100%) rename {lib/typescript => tools}/botskills/README.md (100%) rename {lib/typescript => tools}/botskills/docs/connect-disconnect.md (100%) rename {lib/typescript => tools}/botskills/docs/list.md (100%) rename {lib/typescript => tools}/botskills/docs/refresh.md (100%) rename {lib/typescript => tools}/botskills/docs/update.md (100%) rename {lib/typescript => tools}/botskills/package-lock.json (100%) rename {lib/typescript => tools}/botskills/package.json (100%) rename {lib/typescript => tools}/botskills/src/botskills-connect.ts (100%) rename {lib/typescript => tools}/botskills/src/botskills-disconnect.ts (100%) rename {lib/typescript => tools}/botskills/src/botskills-list.ts (100%) rename {lib/typescript => tools}/botskills/src/botskills-refresh.ts (100%) rename {lib/typescript => tools}/botskills/src/botskills-update.ts (100%) rename {lib/typescript => tools}/botskills/src/botskills.ts (100%) rename {lib/typescript => tools}/botskills/src/functionality/connectSkill.ts (100%) rename {lib/typescript => tools}/botskills/src/functionality/disconnectSkill.ts (100%) rename {lib/typescript => tools}/botskills/src/functionality/index.ts (100%) rename {lib/typescript => tools}/botskills/src/functionality/listSkill.ts (100%) rename {lib/typescript => tools}/botskills/src/functionality/refreshSkill.ts (100%) rename {lib/typescript => tools}/botskills/src/functionality/updateSkill.ts (100%) rename {lib/typescript => tools}/botskills/src/index.ts (100%) rename {lib/typescript => tools}/botskills/src/logger/index.ts (100%) rename {lib/typescript => tools}/botskills/src/logger/logger.ts (100%) rename {lib/typescript => tools}/botskills/src/models/authentication.ts (100%) rename {lib/typescript => tools}/botskills/src/models/cognitiveFile.ts (100%) rename {lib/typescript => tools}/botskills/src/models/connectConfiguration.ts (100%) rename {lib/typescript => tools}/botskills/src/models/disconnectConfiguration.ts (100%) rename {lib/typescript => tools}/botskills/src/models/dispatchFile.ts (100%) rename {lib/typescript => tools}/botskills/src/models/index.ts (100%) rename {lib/typescript => tools}/botskills/src/models/listConfiguration.ts (100%) rename {lib/typescript => tools}/botskills/src/models/refreshConfiguration.ts (100%) rename {lib/typescript => tools}/botskills/src/models/skillFile.ts (100%) rename {lib/typescript => tools}/botskills/src/models/skillManifest.ts (100%) rename {lib/typescript => tools}/botskills/src/models/updateConfiguration.ts (100%) rename {lib/typescript => tools}/botskills/src/utils/authenticationUtils.ts (100%) rename {lib/typescript => tools}/botskills/src/utils/childProcessUtils.ts (100%) rename {lib/typescript => tools}/botskills/src/utils/index.ts (100%) rename {lib/typescript => tools}/botskills/src/utils/validationUtils.ts (100%) rename {lib/typescript => tools}/botskills/test/connect.test.js (100%) rename {lib/typescript => tools}/botskills/test/disconnect.test.js (100%) rename {lib/typescript => tools}/botskills/test/helpers/testLogger.js (100%) rename {lib/typescript => tools}/botskills/test/list.test.js (100%) rename {lib/typescript => tools}/botskills/test/mocha.opts (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/absentSkill.json (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/badSkillsArray.jso (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/connectableSkill.json (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/dispatchFolder/connectableSkill.dispatch (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/emptyDispatch.dispatch (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/emptySkillsArray.json (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/filledDispatch.dispatch (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/filledDispatch.json (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/filledDispatchNoJson.dispatch (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/filledSkillsArray.json (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/invalidSkill.json (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/invalidSkillid.json (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/luFolder/connectableSkill.lu (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/luisFolder/connectableSkill.lu (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/luisFolder/connectableSkill.luis (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.dispatch (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.json (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.lu (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.luis (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/successfulConnectFiles/filledSkillsArray.json (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/testSkill.json (100%) rename {lib/typescript => tools}/botskills/test/mocks/resources/undefinedSkillsArray.json (100%) rename {lib/typescript => tools}/botskills/test/refresh.test.js (100%) rename {lib/typescript => tools}/botskills/test/update.test.js (100%) rename {lib/typescript => tools}/botskills/tsconfig.json (100%) rename {lib/typescript => tools}/botskills/tslint.json (100%) diff --git a/lib/typescript/botskills/.gitignore b/tools/botskills/.gitignore similarity index 100% rename from lib/typescript/botskills/.gitignore rename to tools/botskills/.gitignore diff --git a/lib/typescript/botskills/.nycrc b/tools/botskills/.nycrc similarity index 100% rename from lib/typescript/botskills/.nycrc rename to tools/botskills/.nycrc diff --git a/lib/typescript/botskills/README.md b/tools/botskills/README.md similarity index 100% rename from lib/typescript/botskills/README.md rename to tools/botskills/README.md diff --git a/lib/typescript/botskills/docs/connect-disconnect.md b/tools/botskills/docs/connect-disconnect.md similarity index 100% rename from lib/typescript/botskills/docs/connect-disconnect.md rename to tools/botskills/docs/connect-disconnect.md diff --git a/lib/typescript/botskills/docs/list.md b/tools/botskills/docs/list.md similarity index 100% rename from lib/typescript/botskills/docs/list.md rename to tools/botskills/docs/list.md diff --git a/lib/typescript/botskills/docs/refresh.md b/tools/botskills/docs/refresh.md similarity index 100% rename from lib/typescript/botskills/docs/refresh.md rename to tools/botskills/docs/refresh.md diff --git a/lib/typescript/botskills/docs/update.md b/tools/botskills/docs/update.md similarity index 100% rename from lib/typescript/botskills/docs/update.md rename to tools/botskills/docs/update.md diff --git a/lib/typescript/botskills/package-lock.json b/tools/botskills/package-lock.json similarity index 100% rename from lib/typescript/botskills/package-lock.json rename to tools/botskills/package-lock.json diff --git a/lib/typescript/botskills/package.json b/tools/botskills/package.json similarity index 100% rename from lib/typescript/botskills/package.json rename to tools/botskills/package.json diff --git a/lib/typescript/botskills/src/botskills-connect.ts b/tools/botskills/src/botskills-connect.ts similarity index 100% rename from lib/typescript/botskills/src/botskills-connect.ts rename to tools/botskills/src/botskills-connect.ts diff --git a/lib/typescript/botskills/src/botskills-disconnect.ts b/tools/botskills/src/botskills-disconnect.ts similarity index 100% rename from lib/typescript/botskills/src/botskills-disconnect.ts rename to tools/botskills/src/botskills-disconnect.ts diff --git a/lib/typescript/botskills/src/botskills-list.ts b/tools/botskills/src/botskills-list.ts similarity index 100% rename from lib/typescript/botskills/src/botskills-list.ts rename to tools/botskills/src/botskills-list.ts diff --git a/lib/typescript/botskills/src/botskills-refresh.ts b/tools/botskills/src/botskills-refresh.ts similarity index 100% rename from lib/typescript/botskills/src/botskills-refresh.ts rename to tools/botskills/src/botskills-refresh.ts diff --git a/lib/typescript/botskills/src/botskills-update.ts b/tools/botskills/src/botskills-update.ts similarity index 100% rename from lib/typescript/botskills/src/botskills-update.ts rename to tools/botskills/src/botskills-update.ts diff --git a/lib/typescript/botskills/src/botskills.ts b/tools/botskills/src/botskills.ts similarity index 100% rename from lib/typescript/botskills/src/botskills.ts rename to tools/botskills/src/botskills.ts diff --git a/lib/typescript/botskills/src/functionality/connectSkill.ts b/tools/botskills/src/functionality/connectSkill.ts similarity index 100% rename from lib/typescript/botskills/src/functionality/connectSkill.ts rename to tools/botskills/src/functionality/connectSkill.ts diff --git a/lib/typescript/botskills/src/functionality/disconnectSkill.ts b/tools/botskills/src/functionality/disconnectSkill.ts similarity index 100% rename from lib/typescript/botskills/src/functionality/disconnectSkill.ts rename to tools/botskills/src/functionality/disconnectSkill.ts diff --git a/lib/typescript/botskills/src/functionality/index.ts b/tools/botskills/src/functionality/index.ts similarity index 100% rename from lib/typescript/botskills/src/functionality/index.ts rename to tools/botskills/src/functionality/index.ts diff --git a/lib/typescript/botskills/src/functionality/listSkill.ts b/tools/botskills/src/functionality/listSkill.ts similarity index 100% rename from lib/typescript/botskills/src/functionality/listSkill.ts rename to tools/botskills/src/functionality/listSkill.ts diff --git a/lib/typescript/botskills/src/functionality/refreshSkill.ts b/tools/botskills/src/functionality/refreshSkill.ts similarity index 100% rename from lib/typescript/botskills/src/functionality/refreshSkill.ts rename to tools/botskills/src/functionality/refreshSkill.ts diff --git a/lib/typescript/botskills/src/functionality/updateSkill.ts b/tools/botskills/src/functionality/updateSkill.ts similarity index 100% rename from lib/typescript/botskills/src/functionality/updateSkill.ts rename to tools/botskills/src/functionality/updateSkill.ts diff --git a/lib/typescript/botskills/src/index.ts b/tools/botskills/src/index.ts similarity index 100% rename from lib/typescript/botskills/src/index.ts rename to tools/botskills/src/index.ts diff --git a/lib/typescript/botskills/src/logger/index.ts b/tools/botskills/src/logger/index.ts similarity index 100% rename from lib/typescript/botskills/src/logger/index.ts rename to tools/botskills/src/logger/index.ts diff --git a/lib/typescript/botskills/src/logger/logger.ts b/tools/botskills/src/logger/logger.ts similarity index 100% rename from lib/typescript/botskills/src/logger/logger.ts rename to tools/botskills/src/logger/logger.ts diff --git a/lib/typescript/botskills/src/models/authentication.ts b/tools/botskills/src/models/authentication.ts similarity index 100% rename from lib/typescript/botskills/src/models/authentication.ts rename to tools/botskills/src/models/authentication.ts diff --git a/lib/typescript/botskills/src/models/cognitiveFile.ts b/tools/botskills/src/models/cognitiveFile.ts similarity index 100% rename from lib/typescript/botskills/src/models/cognitiveFile.ts rename to tools/botskills/src/models/cognitiveFile.ts diff --git a/lib/typescript/botskills/src/models/connectConfiguration.ts b/tools/botskills/src/models/connectConfiguration.ts similarity index 100% rename from lib/typescript/botskills/src/models/connectConfiguration.ts rename to tools/botskills/src/models/connectConfiguration.ts diff --git a/lib/typescript/botskills/src/models/disconnectConfiguration.ts b/tools/botskills/src/models/disconnectConfiguration.ts similarity index 100% rename from lib/typescript/botskills/src/models/disconnectConfiguration.ts rename to tools/botskills/src/models/disconnectConfiguration.ts diff --git a/lib/typescript/botskills/src/models/dispatchFile.ts b/tools/botskills/src/models/dispatchFile.ts similarity index 100% rename from lib/typescript/botskills/src/models/dispatchFile.ts rename to tools/botskills/src/models/dispatchFile.ts diff --git a/lib/typescript/botskills/src/models/index.ts b/tools/botskills/src/models/index.ts similarity index 100% rename from lib/typescript/botskills/src/models/index.ts rename to tools/botskills/src/models/index.ts diff --git a/lib/typescript/botskills/src/models/listConfiguration.ts b/tools/botskills/src/models/listConfiguration.ts similarity index 100% rename from lib/typescript/botskills/src/models/listConfiguration.ts rename to tools/botskills/src/models/listConfiguration.ts diff --git a/lib/typescript/botskills/src/models/refreshConfiguration.ts b/tools/botskills/src/models/refreshConfiguration.ts similarity index 100% rename from lib/typescript/botskills/src/models/refreshConfiguration.ts rename to tools/botskills/src/models/refreshConfiguration.ts diff --git a/lib/typescript/botskills/src/models/skillFile.ts b/tools/botskills/src/models/skillFile.ts similarity index 100% rename from lib/typescript/botskills/src/models/skillFile.ts rename to tools/botskills/src/models/skillFile.ts diff --git a/lib/typescript/botskills/src/models/skillManifest.ts b/tools/botskills/src/models/skillManifest.ts similarity index 100% rename from lib/typescript/botskills/src/models/skillManifest.ts rename to tools/botskills/src/models/skillManifest.ts diff --git a/lib/typescript/botskills/src/models/updateConfiguration.ts b/tools/botskills/src/models/updateConfiguration.ts similarity index 100% rename from lib/typescript/botskills/src/models/updateConfiguration.ts rename to tools/botskills/src/models/updateConfiguration.ts diff --git a/lib/typescript/botskills/src/utils/authenticationUtils.ts b/tools/botskills/src/utils/authenticationUtils.ts similarity index 100% rename from lib/typescript/botskills/src/utils/authenticationUtils.ts rename to tools/botskills/src/utils/authenticationUtils.ts diff --git a/lib/typescript/botskills/src/utils/childProcessUtils.ts b/tools/botskills/src/utils/childProcessUtils.ts similarity index 100% rename from lib/typescript/botskills/src/utils/childProcessUtils.ts rename to tools/botskills/src/utils/childProcessUtils.ts diff --git a/lib/typescript/botskills/src/utils/index.ts b/tools/botskills/src/utils/index.ts similarity index 100% rename from lib/typescript/botskills/src/utils/index.ts rename to tools/botskills/src/utils/index.ts diff --git a/lib/typescript/botskills/src/utils/validationUtils.ts b/tools/botskills/src/utils/validationUtils.ts similarity index 100% rename from lib/typescript/botskills/src/utils/validationUtils.ts rename to tools/botskills/src/utils/validationUtils.ts diff --git a/lib/typescript/botskills/test/connect.test.js b/tools/botskills/test/connect.test.js similarity index 100% rename from lib/typescript/botskills/test/connect.test.js rename to tools/botskills/test/connect.test.js diff --git a/lib/typescript/botskills/test/disconnect.test.js b/tools/botskills/test/disconnect.test.js similarity index 100% rename from lib/typescript/botskills/test/disconnect.test.js rename to tools/botskills/test/disconnect.test.js diff --git a/lib/typescript/botskills/test/helpers/testLogger.js b/tools/botskills/test/helpers/testLogger.js similarity index 100% rename from lib/typescript/botskills/test/helpers/testLogger.js rename to tools/botskills/test/helpers/testLogger.js diff --git a/lib/typescript/botskills/test/list.test.js b/tools/botskills/test/list.test.js similarity index 100% rename from lib/typescript/botskills/test/list.test.js rename to tools/botskills/test/list.test.js diff --git a/lib/typescript/botskills/test/mocha.opts b/tools/botskills/test/mocha.opts similarity index 100% rename from lib/typescript/botskills/test/mocha.opts rename to tools/botskills/test/mocha.opts diff --git a/lib/typescript/botskills/test/mocks/resources/absentSkill.json b/tools/botskills/test/mocks/resources/absentSkill.json similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/absentSkill.json rename to tools/botskills/test/mocks/resources/absentSkill.json diff --git a/lib/typescript/botskills/test/mocks/resources/badSkillsArray.jso b/tools/botskills/test/mocks/resources/badSkillsArray.jso similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/badSkillsArray.jso rename to tools/botskills/test/mocks/resources/badSkillsArray.jso diff --git a/lib/typescript/botskills/test/mocks/resources/connectableSkill.json b/tools/botskills/test/mocks/resources/connectableSkill.json similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/connectableSkill.json rename to tools/botskills/test/mocks/resources/connectableSkill.json diff --git a/lib/typescript/botskills/test/mocks/resources/dispatchFolder/connectableSkill.dispatch b/tools/botskills/test/mocks/resources/dispatchFolder/connectableSkill.dispatch similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/dispatchFolder/connectableSkill.dispatch rename to tools/botskills/test/mocks/resources/dispatchFolder/connectableSkill.dispatch diff --git a/lib/typescript/botskills/test/mocks/resources/emptyDispatch.dispatch b/tools/botskills/test/mocks/resources/emptyDispatch.dispatch similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/emptyDispatch.dispatch rename to tools/botskills/test/mocks/resources/emptyDispatch.dispatch diff --git a/lib/typescript/botskills/test/mocks/resources/emptySkillsArray.json b/tools/botskills/test/mocks/resources/emptySkillsArray.json similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/emptySkillsArray.json rename to tools/botskills/test/mocks/resources/emptySkillsArray.json diff --git a/lib/typescript/botskills/test/mocks/resources/filledDispatch.dispatch b/tools/botskills/test/mocks/resources/filledDispatch.dispatch similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/filledDispatch.dispatch rename to tools/botskills/test/mocks/resources/filledDispatch.dispatch diff --git a/lib/typescript/botskills/test/mocks/resources/filledDispatch.json b/tools/botskills/test/mocks/resources/filledDispatch.json similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/filledDispatch.json rename to tools/botskills/test/mocks/resources/filledDispatch.json diff --git a/lib/typescript/botskills/test/mocks/resources/filledDispatchNoJson.dispatch b/tools/botskills/test/mocks/resources/filledDispatchNoJson.dispatch similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/filledDispatchNoJson.dispatch rename to tools/botskills/test/mocks/resources/filledDispatchNoJson.dispatch diff --git a/lib/typescript/botskills/test/mocks/resources/filledSkillsArray.json b/tools/botskills/test/mocks/resources/filledSkillsArray.json similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/filledSkillsArray.json rename to tools/botskills/test/mocks/resources/filledSkillsArray.json diff --git a/lib/typescript/botskills/test/mocks/resources/invalidSkill.json b/tools/botskills/test/mocks/resources/invalidSkill.json similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/invalidSkill.json rename to tools/botskills/test/mocks/resources/invalidSkill.json diff --git a/lib/typescript/botskills/test/mocks/resources/invalidSkillid.json b/tools/botskills/test/mocks/resources/invalidSkillid.json similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/invalidSkillid.json rename to tools/botskills/test/mocks/resources/invalidSkillid.json diff --git a/lib/typescript/botskills/test/mocks/resources/luFolder/connectableSkill.lu b/tools/botskills/test/mocks/resources/luFolder/connectableSkill.lu similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/luFolder/connectableSkill.lu rename to tools/botskills/test/mocks/resources/luFolder/connectableSkill.lu diff --git a/lib/typescript/botskills/test/mocks/resources/luisFolder/connectableSkill.lu b/tools/botskills/test/mocks/resources/luisFolder/connectableSkill.lu similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/luisFolder/connectableSkill.lu rename to tools/botskills/test/mocks/resources/luisFolder/connectableSkill.lu diff --git a/lib/typescript/botskills/test/mocks/resources/luisFolder/connectableSkill.luis b/tools/botskills/test/mocks/resources/luisFolder/connectableSkill.luis similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/luisFolder/connectableSkill.luis rename to tools/botskills/test/mocks/resources/luisFolder/connectableSkill.luis diff --git a/lib/typescript/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.dispatch b/tools/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.dispatch similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.dispatch rename to tools/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.dispatch diff --git a/lib/typescript/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.json b/tools/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.json similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.json rename to tools/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.json diff --git a/lib/typescript/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.lu b/tools/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.lu similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.lu rename to tools/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.lu diff --git a/lib/typescript/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.luis b/tools/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.luis similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.luis rename to tools/botskills/test/mocks/resources/successfulConnectFiles/connectableSkill.luis diff --git a/lib/typescript/botskills/test/mocks/resources/successfulConnectFiles/filledSkillsArray.json b/tools/botskills/test/mocks/resources/successfulConnectFiles/filledSkillsArray.json similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/successfulConnectFiles/filledSkillsArray.json rename to tools/botskills/test/mocks/resources/successfulConnectFiles/filledSkillsArray.json diff --git a/lib/typescript/botskills/test/mocks/resources/testSkill.json b/tools/botskills/test/mocks/resources/testSkill.json similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/testSkill.json rename to tools/botskills/test/mocks/resources/testSkill.json diff --git a/lib/typescript/botskills/test/mocks/resources/undefinedSkillsArray.json b/tools/botskills/test/mocks/resources/undefinedSkillsArray.json similarity index 100% rename from lib/typescript/botskills/test/mocks/resources/undefinedSkillsArray.json rename to tools/botskills/test/mocks/resources/undefinedSkillsArray.json diff --git a/lib/typescript/botskills/test/refresh.test.js b/tools/botskills/test/refresh.test.js similarity index 100% rename from lib/typescript/botskills/test/refresh.test.js rename to tools/botskills/test/refresh.test.js diff --git a/lib/typescript/botskills/test/update.test.js b/tools/botskills/test/update.test.js similarity index 100% rename from lib/typescript/botskills/test/update.test.js rename to tools/botskills/test/update.test.js diff --git a/lib/typescript/botskills/tsconfig.json b/tools/botskills/tsconfig.json similarity index 100% rename from lib/typescript/botskills/tsconfig.json rename to tools/botskills/tsconfig.json diff --git a/lib/typescript/botskills/tslint.json b/tools/botskills/tslint.json similarity index 100% rename from lib/typescript/botskills/tslint.json rename to tools/botskills/tslint.json From ac3b2f8d9e506877a9929c59b9485da7ae7892e8 Mon Sep 17 00:00:00 2001 From: Martin Battaglino Date: Wed, 26 Jun 2019 14:16:12 -0300 Subject: [PATCH 2/4] Update doc references --- docs/howto/skills/addingskills.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/howto/skills/addingskills.md b/docs/howto/skills/addingskills.md index d38be0e6d5..8bf3207ec5 100644 --- a/docs/howto/skills/addingskills.md +++ b/docs/howto/skills/addingskills.md @@ -43,7 +43,7 @@ botskills connect --botName YOUR_BOT_NAME --remoteManifest "http:// Note: The id of the Skill can also be aquired using the `botskills list` command. You can check the [Skill CLI documentation](/lib/typescript/botskills/docs/list.md) on this command. +> Note: The id of the Skill can also be aquired using the `botskills list` command. You can check the [Skill CLI documentation](/tools/botskills/docs/list.md) on this command. ## Updating an existing Skill to reflect changes to Actions or LUIS model From 9a1b351bcaac0878aa17bc9df8ed7674f5763868 Mon Sep 17 00:00:00 2001 From: Martin Battaglino Date: Wed, 26 Jun 2019 14:16:35 -0300 Subject: [PATCH 3/4] Update yaml files --- yaml/typescript/botskills.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/yaml/typescript/botskills.yml b/yaml/typescript/botskills.yml index b3ff4d4dbf..b13d30ba7d 100644 --- a/yaml/typescript/botskills.yml +++ b/yaml/typescript/botskills.yml @@ -7,7 +7,7 @@ trigger: paths: include: - - lib/typescript/botskills/* + - tools/botskills/* pool: name: Hosted VS2017 @@ -19,14 +19,14 @@ steps: - task: Npm@1 displayName: 'npm install' inputs: - workingDir: lib/typescript/botskills + workingDir: tools/botskills verbose: false - task: Npm@1 displayName: 'npm run build' inputs: command: custom - workingDir: lib/typescript/botskills + workingDir: tools/botskills verbose: false customCommand: 'run build' @@ -34,7 +34,7 @@ steps: displayName: 'npm test - coverage' inputs: command: custom - workingDir: lib/typescript/botskills + workingDir: tools/botskills verbose: false customCommand: 'run test-coverage-ci' @@ -42,13 +42,13 @@ steps: displayName: 'publish test results' inputs: testResultsFiles: 'test-results.xml' - searchFolder: 'lib/typescript/botskills' + searchFolder: 'tools/botskills' failTaskOnFailedTests: true - task: PublishCodeCoverageResults@1 displayName: 'publish code coverage' inputs: codeCoverageTool: Cobertura - summaryFileLocation: 'lib/typescript/botskills/coverage/cobertura-coverage.xml' - reportDirectory: 'lib/typescript/botskills/coverage/' + summaryFileLocation: 'tools/botskills/coverage/cobertura-coverage.xml' + reportDirectory: 'tools/botskills/coverage/' From cf123cc4b4ed877d9f0153979358c74e7063056d Mon Sep 17 00:00:00 2001 From: Martin Battaglino Date: Wed, 26 Jun 2019 14:16:49 -0300 Subject: [PATCH 4/4] Update package-lock file --- tools/botskills/package-lock.json | 116 ++++++++++++++---------------- 1 file changed, 54 insertions(+), 62 deletions(-) diff --git a/tools/botskills/package-lock.json b/tools/botskills/package-lock.json index f0b4f0cd7b..9fbdc3a37a 100644 --- a/tools/botskills/package-lock.json +++ b/tools/botskills/package-lock.json @@ -67,9 +67,9 @@ } }, "@babel/parser": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.4.tgz", - "integrity": "sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w==", + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz", + "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==", "dev": true }, "@babel/template": { @@ -84,16 +84,16 @@ } }, "@babel/traverse": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.4.tgz", - "integrity": "sha512-Gw6qqkw/e6AGzlyj9KnkabJX7VcubqPtkUQVAwkc0wUMldr3A/hezNB3Rc5eIvId95iSGkGIOe5hh1kMKf951A==", + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz", + "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", "@babel/generator": "^7.4.4", "@babel/helper-function-name": "^7.1.0", "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.4.4", + "@babel/parser": "^7.4.5", "@babel/types": "^7.4.4", "debug": "^4.1.0", "globals": "^11.1.0", @@ -142,9 +142,9 @@ } }, "@sinonjs/samsam": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.1.tgz", - "integrity": "sha512-wRSfmyd81swH0hA1bxJZJ57xr22kC07a1N4zuIL47yTS04bDk6AoCkczcqHEjcRPmJ+FruGJ9WBQiJwMtIElFw==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.2.tgz", + "integrity": "sha512-ILO/rR8LfAb60Y1Yfp9vxfYAASK43NFC2mLzpvLUbCQY/Qu8YwReboseu8aheCEkyElZF2L2T9mHcR2bgdvZyA==", "dev": true, "requires": { "@sinonjs/commons": "^1.0.2", @@ -183,9 +183,9 @@ } }, "@types/node": { - "version": "10.14.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.6.tgz", - "integrity": "sha512-Fvm24+u85lGmV4hT5G++aht2C5I4Z4dYlWZIh62FAfFO/TfzXtPpoLI6I7AuBWkIFqZCnhFOoTT7RjjaIL5Fjg==", + "version": "10.14.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.10.tgz", + "integrity": "sha512-V8wj+w2YMNvGuhgl/MA5fmTxgjmVHVoasfIaxMMZJV6Y8Kk+Ydpi1z2whoShDCJ2BuNVoqH/h1hrygnBxkrw/Q==", "dev": true }, "@types/request": { @@ -325,9 +325,9 @@ } }, "botdispatch": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/botdispatch/-/botdispatch-1.4.5.tgz", - "integrity": "sha512-j3KBFJHZcyweee1q2ru8uqJPYA2utKo0MOQcNeFw3/CbMCrl2mefkezAPhxlkMOXYBYqARmiiDNf9TIXiaVBgw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/botdispatch/-/botdispatch-1.5.0.tgz", + "integrity": "sha512-1prqWiC5WzcmR6+YShZ75aLqbR6qXUF8YGilh2+7fGxr9f1IV8iGKoH1whmlYXDLvWWwsWa5CIN+M03n2GDnzw==", "requires": { "dotnet-2.1": "^2.1.0" } @@ -910,9 +910,9 @@ } }, "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true }, "invert-kv": { @@ -1213,9 +1213,9 @@ } }, "lolex": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.0.1.tgz", - "integrity": "sha512-UHuOBZ5jjsKuzbB/gRNNW8Vg8f00Emgskdq2kvZxgBJCS0aqquAuXai/SkWORlKeZEiNQWZjFZOqIUcH9LqKCw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.1.0.tgz", + "integrity": "sha512-BYxIEXiVq5lGIXeVHnsFzqa1TxN5acnKnPCdlZSpzm8viNEOhiigupA4vTQ9HEFQ6nLTQ9wQOgBknJgzUYQ9Aw==", "dev": true }, "lru-cache": { @@ -1388,9 +1388,9 @@ } }, "mocha-junit-reporter": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-1.22.0.tgz", - "integrity": "sha512-nRBCVxzYYhOqQr2XlByLRj5MAAy7djArRkGUSx9dGc+B9NMu4yCeo74uXKALAnMhXjuLmtAL9F8WGe3wQV30IA==", + "version": "1.23.0", + "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-1.23.0.tgz", + "integrity": "sha512-pmpnEO4iDTmLfrT2RKqPsc5relG4crnDSGmXPuGogdda27A7kLujDNJV4EbTbXlVBCZXggN9rQYPEWMkOv4AAA==", "dev": true, "requires": { "debug": "^2.2.0", @@ -1442,24 +1442,16 @@ "dev": true }, "nise": { - "version": "1.4.10", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.4.10.tgz", - "integrity": "sha512-sa0RRbj53dovjc7wombHmVli9ZihXbXCQ2uH3TNm03DyvOSIQbxg+pbqDKrk2oxMK1rtLGVlKxcB9rrc6X5YjA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.0.tgz", + "integrity": "sha512-Z3sfYEkLFzFmL8KY6xnSJLRxwQwYBjOXi/24lb62ZnZiGA0JUzGGTI6TBIgfCSMIDl9Jlu8SRmHNACLTemDHww==", "dev": true, "requires": { "@sinonjs/formatio": "^3.1.0", "@sinonjs/text-encoding": "^0.7.1", "just-extend": "^4.0.2", - "lolex": "^2.3.2", + "lolex": "^4.1.0", "path-to-regexp": "^1.7.0" - }, - "dependencies": { - "lolex": { - "version": "2.7.5", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz", - "integrity": "sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==", - "dev": true - } } }, "node-environment-flags": { @@ -1758,9 +1750,9 @@ "dev": true }, "psl": { - "version": "1.1.31", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz", - "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==" + "version": "1.1.33", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.33.tgz", + "integrity": "sha512-LTDP2uSrsc7XCb5lO7A8BI1qYxRe/8EqlRvMeEl6rsnYAqDOl8xHR+8lSAIVfrNaSAlTPTNOCgNjWcoUL3AZsw==" }, "pump": { "version": "3.0.0", @@ -1870,9 +1862,9 @@ "dev": true }, "resolve": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz", - "integrity": "sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz", + "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -1904,9 +1896,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "semver": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz", - "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==" + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.2.tgz", + "integrity": "sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==" }, "set-blocking": { "version": "2.0.0", @@ -2115,15 +2107,15 @@ "dev": true }, "tslib": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", - "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", + "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==", "dev": true }, "tslint": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.16.0.tgz", - "integrity": "sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==", + "version": "5.18.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.18.0.tgz", + "integrity": "sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -2132,7 +2124,7 @@ "commander": "^2.12.1", "diff": "^3.2.0", "glob": "^7.1.1", - "js-yaml": "^3.13.0", + "js-yaml": "^3.13.1", "minimatch": "^3.0.4", "mkdirp": "^0.5.1", "resolve": "^1.3.2", @@ -2198,15 +2190,15 @@ "dev": true }, "typescript": { - "version": "3.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz", - "integrity": "sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.2.tgz", + "integrity": "sha512-7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA==", "dev": true }, "uglify-js": { - "version": "3.5.12", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.12.tgz", - "integrity": "sha512-KeQesOpPiZNgVwJj8Ge3P4JYbQHUdZzpx6Fahy6eKAYRSV4zhVmLXoC+JtOeYxcHCHTve8RG1ZGdTvpeOUM26Q==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", + "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==", "dev": true, "optional": true, "requires": { @@ -2340,9 +2332,9 @@ "dev": true }, "write-file-atomic": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.2.tgz", - "integrity": "sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", + "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", "dev": true, "requires": { "graceful-fs": "^4.1.11",