From 03eed5131ad7769c0404fcb7414634334e733722 Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Sun, 13 Nov 2022 14:41:25 +0100 Subject: [PATCH] move io into bot --- package.json | 2 +- packages/{io => bot}/USES_CASES.md | 0 .../bot.class.js => core/core.class.js} | 4 +-- packages/bot/index.js | 28 +++++++++++++++---- packages/{io/classes => bot/io}/flow.class.js | 0 packages/{ => bot}/io/methods/addAnswer.js | 2 +- packages/{ => bot}/io/methods/addKeyword.js | 2 +- packages/{ => bot}/io/methods/index.js | 0 packages/{ => bot}/io/methods/toJson.js | 0 packages/{ => bot}/io/rollup-cli.config.js | 0 packages/bot/package.json | 11 ++++++-- .../{classes => provider}/provider.class.js | 0 packages/bot/rollup-bot.config.js | 2 +- packages/bot/tests/bot.class.test.js | 13 ++++----- packages/{io => bot}/tests/methods.test.js | 2 +- packages/{io => bot}/utils/hash.js | 0 packages/io/index.js | 13 --------- packages/io/package.json | 11 -------- packages/io/utils/index.js | 3 -- 19 files changed, 44 insertions(+), 49 deletions(-) rename packages/{io => bot}/USES_CASES.md (100%) rename packages/bot/{classes/bot.class.js => core/core.class.js} (97%) rename packages/{io/classes => bot/io}/flow.class.js (100%) rename packages/{ => bot}/io/methods/addAnswer.js (95%) rename packages/{ => bot}/io/methods/addKeyword.js (95%) rename packages/{ => bot}/io/methods/index.js (100%) rename packages/{ => bot}/io/methods/toJson.js (100%) rename packages/{ => bot}/io/rollup-cli.config.js (100%) rename packages/bot/{classes => provider}/provider.class.js (100%) rename packages/{io => bot}/tests/methods.test.js (98%) rename packages/{io => bot}/utils/hash.js (100%) delete mode 100644 packages/io/index.js delete mode 100644 packages/io/package.json delete mode 100644 packages/io/utils/index.js diff --git a/package.json b/package.json index 2d4cc08..0f85b9a 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "cli:rollup": "rollup ./packages/cli/index.js --config ./packages/cli/rollup-cli.config.js ", "io:rollup": "rollup ./packages/io/index.js --config ./packages/io/rollup-cli.config.js", - "core:rollup": "rollup ./packages/core/index.js --config ./packages/core/rollup-cli.config.js", + "bot:rollup": "rollup ./packages/bot/index.js --config ./packages/bot/rollup-bot.config.js", "provider:rollup": "rollup ./packages/provider/index.js --config ./packages/provider/rollup-cli.config.js", "database:rollup": "rollup ./packages/database/index.js --config ./packages/database/rollup-cli.config.js", "format:check": "prettier --check ./packages", diff --git a/packages/io/USES_CASES.md b/packages/bot/USES_CASES.md similarity index 100% rename from packages/io/USES_CASES.md rename to packages/bot/USES_CASES.md diff --git a/packages/bot/classes/bot.class.js b/packages/bot/core/core.class.js similarity index 97% rename from packages/bot/classes/bot.class.js rename to packages/bot/core/core.class.js index d856bb0..256aebc 100644 --- a/packages/bot/classes/bot.class.js +++ b/packages/bot/core/core.class.js @@ -6,7 +6,7 @@ const { printer } = require('../utils/interactive') * [ ] Buscar mensaje en flow * */ -class BotClass { +class CoreClass { flowClass databaseClass providerClass @@ -75,4 +75,4 @@ class BotClass { } } } -module.exports = BotClass +module.exports = CoreClass diff --git a/packages/bot/index.js b/packages/bot/index.js index 2c18122..6f14465 100644 --- a/packages/bot/index.js +++ b/packages/bot/index.js @@ -1,12 +1,30 @@ -const BotClass = require('./classes/bot.class') -const ProviderClass = require('./classes/provider.class') +const CoreClass = require('./core/core.class') +const ProviderClass = require('./provider/provider.class') +const FlowClass = require('./io/flow.class') +const { addKeyword, addAnswer } = require('./io/methods') /** * Crear instancia de clase * @param {*} args * @returns */ -const create = async ({ flow, database, provider }) => - new BotClass(flow, database, provider) +const createBot = async ({ flow, database, provider }) => + new CoreClass(flow, database, provider) -module.exports = { create, ProviderClass } +/** + * Crear instancia de clase + * @param {*} args + * @returns + */ +const createFlow = (args) => { + return new FlowClass(args) +} + +module.exports = { + createBot, + createFlow, + addKeyword, + addAnswer, + ProviderClass, + CoreClass, +} diff --git a/packages/io/classes/flow.class.js b/packages/bot/io/flow.class.js similarity index 100% rename from packages/io/classes/flow.class.js rename to packages/bot/io/flow.class.js diff --git a/packages/io/methods/addAnswer.js b/packages/bot/io/methods/addAnswer.js similarity index 95% rename from packages/io/methods/addAnswer.js rename to packages/bot/io/methods/addAnswer.js index d383c3c..ace843e 100644 --- a/packages/io/methods/addAnswer.js +++ b/packages/bot/io/methods/addAnswer.js @@ -1,4 +1,4 @@ -const { generateRef } = require('../utils') +const { generateRef } = require('../../utils/hash') const { toJson } = require('./toJson') /** * diff --git a/packages/io/methods/addKeyword.js b/packages/bot/io/methods/addKeyword.js similarity index 95% rename from packages/io/methods/addKeyword.js rename to packages/bot/io/methods/addKeyword.js index 5eba51f..18bcaa5 100644 --- a/packages/io/methods/addKeyword.js +++ b/packages/bot/io/methods/addKeyword.js @@ -1,4 +1,4 @@ -const { generateRef } = require('../utils') +const { generateRef } = require('../../utils/hash') const { addAnswer } = require('./addAnswer') const { toJson } = require('./toJson') /** diff --git a/packages/io/methods/index.js b/packages/bot/io/methods/index.js similarity index 100% rename from packages/io/methods/index.js rename to packages/bot/io/methods/index.js diff --git a/packages/io/methods/toJson.js b/packages/bot/io/methods/toJson.js similarity index 100% rename from packages/io/methods/toJson.js rename to packages/bot/io/methods/toJson.js diff --git a/packages/io/rollup-cli.config.js b/packages/bot/io/rollup-cli.config.js similarity index 100% rename from packages/io/rollup-cli.config.js rename to packages/bot/io/rollup-cli.config.js diff --git a/packages/bot/package.json b/packages/bot/package.json index 53c7507..87071c7 100644 --- a/packages/bot/package.json +++ b/packages/bot/package.json @@ -2,11 +2,10 @@ "name": "@bot-whatsapp/bot", "version": "0.0.1", "description": "", - "main": "index.js", + "main": "./lib/bundle.bot.cjs", "private": true, "scripts": { - "core:dev": "node ./index.js", - "core:rollup": "node ../../node_modules/.bin/rollup index.js --config ./rollup-cli.config.js", + "bot:rollup": "node ../../node_modules/.bin/rollup index.js --config ./rollup-cli.config.js", "format:check": "prettier --check .", "format:write": "prettier --write .", "lint:check": "eslint .", @@ -14,6 +13,12 @@ "test.unit": "cross-env NODE_ENV=test node ../../node_modules/uvu/bin.js tests" }, "keywords": [], + "files": [ + "./lib/bundle.bot.cjs", + "./provider/*", + "./core/*", + "./io/*" + ], "author": "", "license": "ISC", "devDependencies": { diff --git a/packages/bot/classes/provider.class.js b/packages/bot/provider/provider.class.js similarity index 100% rename from packages/bot/classes/provider.class.js rename to packages/bot/provider/provider.class.js diff --git a/packages/bot/rollup-bot.config.js b/packages/bot/rollup-bot.config.js index e244f5d..97dc00c 100644 --- a/packages/bot/rollup-bot.config.js +++ b/packages/bot/rollup-bot.config.js @@ -2,7 +2,7 @@ const commonjs = require('@rollup/plugin-commonjs') const { nodeResolve } = require('@rollup/plugin-node-resolve') const { join } = require('path') -const PATH = join(__dirname, 'lib', 'bot', 'bundle.bot.cjs') +const PATH = join(__dirname, 'lib', 'bundle.bot.cjs') module.exports = { input: 'index.js', diff --git a/packages/bot/tests/bot.class.test.js b/packages/bot/tests/bot.class.test.js index fb5ba4f..e5f512d 100644 --- a/packages/bot/tests/bot.class.test.js +++ b/packages/bot/tests/bot.class.test.js @@ -1,8 +1,7 @@ const { test } = require('uvu') const assert = require('uvu/assert') const MockProvider = require('../../../__mocks__/mock.provider') -const { create } = require('@bot-whatsapp/bot') -const BotClass = require('@bot-whatsapp/bot/classes/bot.class') +const { createBot, CoreClass } = require('@bot-whatsapp/bot') class MockFlow { find = () => {} @@ -12,17 +11,17 @@ class MockDB { save = () => {} } -test(`[BotClass] Probando instanciamiento de clase`, async () => { +test(`[CoreClass] Probando instanciamiento de clase`, async () => { const setting = { flow: new MockFlow(), database: new MockDB(), provider: new MockProvider(), } - const bot = await create(setting) - assert.is(bot instanceof BotClass, true) + const bot = await createBot(setting) + assert.is(bot instanceof CoreClass, true) }) -test(`[BotClass] Eventos 'require_action,ready,auth_failure,message '`, async () => { +test(`[Bot] Eventos 'require_action,ready,auth_failure,message '`, async () => { let responseEvents = {} const MOCK_EVENTS = { @@ -47,7 +46,7 @@ test(`[BotClass] Eventos 'require_action,ready,auth_failure,message '`, async () database: new MockDB(), provider: mockProvider, } - await create(setting) + await createBot(setting) /// Escuchamos eventos mockProvider.on( diff --git a/packages/io/tests/methods.test.js b/packages/bot/tests/methods.test.js similarity index 98% rename from packages/io/tests/methods.test.js rename to packages/bot/tests/methods.test.js index a649d62..cfefbb2 100644 --- a/packages/io/tests/methods.test.js +++ b/packages/bot/tests/methods.test.js @@ -1,6 +1,6 @@ const { test } = require('uvu') const assert = require('uvu/assert') -const { addKeyword, addAnswer } = require('../methods') +const { addKeyword, addAnswer } = require('@bot-whatsapp/bot') test('Debere probar las propeidades', () => { const ARRANGE = { diff --git a/packages/io/utils/hash.js b/packages/bot/utils/hash.js similarity index 100% rename from packages/io/utils/hash.js rename to packages/bot/utils/hash.js diff --git a/packages/io/index.js b/packages/io/index.js deleted file mode 100644 index c47f212..0000000 --- a/packages/io/index.js +++ /dev/null @@ -1,13 +0,0 @@ -const { addKeyword, addAnswer } = require('./methods') -const FlowClass = require('./classes/flow.class') - -/** - * Crear instancia de clase - * @param {*} args - * @returns - */ -const create = (args) => { - return new FlowClass(args) -} - -module.exports = { addKeyword, addAnswer, create } diff --git a/packages/io/package.json b/packages/io/package.json deleted file mode 100644 index 0dd5b26..0000000 --- a/packages/io/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "@bot-whatsapp/io", - "version": "0.0.1", - "description": "", - "main": "index.js", - "private": true, - "keywords": [], - "author": "", - "license": "ISC", - "devDependencies": {} -} diff --git a/packages/io/utils/index.js b/packages/io/utils/index.js deleted file mode 100644 index 1461cef..0000000 --- a/packages/io/utils/index.js +++ /dev/null @@ -1,3 +0,0 @@ -const { generateRef } = require('./hash') - -module.exports = { generateRef }