From 53a36558fdb57b476ff9281eea06f17896bd3f60 Mon Sep 17 00:00:00 2001 From: Offer Akrabi Date: Thu, 25 Jan 2018 14:45:40 +0200 Subject: [PATCH 1/2] unexposed factory, exposed init function instead --- index.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 345a47e..1df00f9 100644 --- a/index.js +++ b/index.js @@ -13,13 +13,23 @@ const factory = require('./lib/nlu/factory'); const intentity = require('./lib/nlu/intentity'); const nlu = require('./lib/nlu/nlu'); - +function init(manifest) { + factory.getNLUs(manifest).then(updatedManifest => { + if (updatedManifest.nlu.regexp) { + updatedManifest.intents = require('../../res/nlu/intents'); + } + handler.manifest = updatedManifest; + factory.createAll(updatedManifest).then(function (engines) { + handler.engines = engines; + }); + }); +} // Server is exported for testing purposes module.exports = { handler: handler, server: server, - factory: factory, + init: init, intentity: intentity, nlu: nlu }; From d340e7d4b6ffa33534d9ed996355dabcf69bf203 Mon Sep 17 00:00:00 2001 From: Offer Akrabi Date: Thu, 25 Jan 2018 15:00:19 +0200 Subject: [PATCH 2/2] removed the force parameter from all nlu engines' init function --- lib/nlu/bundles/engines/regexp/nlu.js | 6 +++--- lib/nlu/bundles/engines/wcs/nlu.js | 6 +++--- lib/nlu/nlu.js | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/nlu/bundles/engines/regexp/nlu.js b/lib/nlu/bundles/engines/regexp/nlu.js index 1d48a03..e385c85 100644 --- a/lib/nlu/bundles/engines/regexp/nlu.js +++ b/lib/nlu/bundles/engines/regexp/nlu.js @@ -19,10 +19,10 @@ class Nlu extends Base { this.patterns = []; } - init(resource, force) { + init(resource) { var self = this; return new Promise((resolve, reject) => { - load(self, resource, true, (err, result) => { + load(self, resource, (err, result) => { resolve(self); }); }); @@ -69,7 +69,7 @@ class Nlu extends Base { } -function load(self, resource, force, cb) { +function load(self, resource, cb) { // Load the regular expression resource resource.intents.forEach(intent => { if (intent.visibility !== 'gone') { diff --git a/lib/nlu/bundles/engines/wcs/nlu.js b/lib/nlu/bundles/engines/wcs/nlu.js index 4ce5e9f..4602f06 100644 --- a/lib/nlu/bundles/engines/wcs/nlu.js +++ b/lib/nlu/bundles/engines/wcs/nlu.js @@ -17,9 +17,9 @@ class Nlu extends Base { this.workspace = {}; } - init(resource, force) { + init(resource) { return new Promise((resolve, reject) => { - load(this, resource, force, (err, result) => { + load(this, resource, (err, result) => { if (err) { logger.error(err); reject(); @@ -76,7 +76,7 @@ class Nlu extends Base { } } -function load(self, resource, force, cb) { +function load(self, resource, cb) { // Bind to existing workspace or create new one with specified content Object.keys(resource.workspace).forEach(language => { if (resource.workspace[language].workspace_id) { diff --git a/lib/nlu/nlu.js b/lib/nlu/nlu.js index b3b7eeb..c031a2b 100644 --- a/lib/nlu/nlu.js +++ b/lib/nlu/nlu.js @@ -14,9 +14,8 @@ class Nlu { /** * initialization function - will be called once (in the index.js file) when loading the skill * @param resource - this is the nlu resource configuration file (you get it by calling manifest.nlu['nlu type']) - * @param force - deprecated */ - init(resource, force) { + init(resource) { } /**