removed generating of intent names

src/create-intent.js

@@ -1,6 +1,5 @@
 'use strict';
 const _ = require('lodash');
-const bases = require('bases');
 const builtInIntentsMap = require('./built-in-intents-map');
 const validator = require('./validator');
 const parseError = require('./error-handler').parseError;
@@ -17,12 +16,11 @@ module.exports = (intents, name, richUtterances, handler) => {
   // Convert utterances to array
   richUtterances = _.isArray(richUtterances) ? richUtterances : [richUtterances];
 
-  // If intent name is not specified, try to generate unique one
   if (!name) {
-    name = generateIntentName(intents);
-
+    const e = parseError(new Error(`All intents must have name.`));
+    throw e;
   } else if (!validator.isNameValid(name)) {
-    const e = parseError(new Error(`Intent name ${name} is invalid. Only lowercase and uppercase letters are allowed`));
+    const e = parseError(new Error(`Intent name ${name} is invalid. Only lowercase and uppercase letters are allowed.`));
     throw e;
   } else if (builtInIntentsMap[name]) {
     // If built-in intent name was used map intent name to it
@@ -42,13 +40,3 @@ module.exports = (intents, name, richUtterances, handler) => {
     handler: handler
   };
 };
-
-const generateIntentName = (intents) => {
-  let position = 0;
-  let generatedName;
-
-  // While generated name is not already used and generatedName is not built-in intent (just in case)
-  while (intents[(generatedName = bases.toBase52(position++))] && !builtInIntentsMap[generatedName]);
-
-  return generatedName;
-};

test/basic.spec.js

@@ -85,7 +85,7 @@ describe('basic app handler', () => {
   });
 
   it('should handle intent with slots', (done) => {
-    const request = alexia.createIntentRequest(intents[5].name, {name: 'Borimir'}, null, false, 'appId1');
+    const request = alexia.createIntentRequest(intents[4].name, {name: 'Borimir'}, null, false, 'appId1');
 
     app.handle(request, (response) => {
       expect(response.response.outputSpeech.text).equal('okay sir your name is Borimir');
@@ -126,8 +126,8 @@ describe('basic app handler', () => {
     });
   });
 
-  it('should handle async intent', (done) => {
-    const request = alexia.createIntentRequest(intents[12].name, null, null, false, 'appId1');
+  it('should handle Async intent', (done) => {
+    const request = alexia.createIntentRequest(intents[11].name, null, null, false, 'appId1');
 
     app.handle(request, (response) => {
       expect(response.response.outputSpeech.text).equal('I just did stuff asynchronously. Thank you for this opportunity');
@@ -224,13 +224,23 @@ describe('basic app handler', () => {
     }
   });
 
+  it('should not create intent without name', () => {
+    try {
+      const app2 = alexia.createApp('App2');
+      app2.intent(null, 'Name', () => 'Must have name');
+      throw new Error('Name of intent was not specified.');
+    } catch (e) {
+      expect(e).to.include('All intents must have name.');
+    }
+  });
+
   it('should not create intent with invalid name', () => {
     try {
       const app2 = alexia.createApp('App2');
       app2.intent('Mega -.- Intent o/', 'Hi', () => 'Nope bye');
       throw new Error('App was handled with invalid intent name');
     } catch (e) {
-      expect(e).to.include('Intent name Mega -.- Intent o/ is invalid. Only lowercase and uppercase letters are allowed');
+      expect(e).to.include('Intent name Mega -.- Intent o/ is invalid. Only lowercase and uppercase letters are allowed.');
     }
   });
 
@@ -298,5 +308,4 @@ describe('basic app handler', () => {
       done();
     });
   });
-
 });

test/mock/assets.js

@@ -4,14 +4,13 @@ exports.intentSchema = {
   intents: [
     {intent: 'FirstIntent'},
     {intent: 'NamedIntent'},
-    {intent: 'a'},
-    {intent: 'b'},
+    {intent: 'Multiple'},
     {
-      intent: 'c',
+      intent: 'Age',
       slots: [{name: 'age', type: 'AMAZON.NUMBER'}]
     },
     {
-      intent: 'd',
+      intent: 'Name',
       slots: [{name: 'name', type: 'Name'}]
     },
     {intent: 'AMAZON.StopIntent'},
@@ -20,7 +19,7 @@ exports.intentSchema = {
     {intent: 'IntentA'},
     {intent: 'IntentB'},
     {intent: 'IntentC'},
-    {intent: 'e'},
+    {intent: 'Async'},
     {intent: 'AnotherCardIntentSample'},
     {intent: 'IntentWithoutUtterances'}
   ]
@@ -30,18 +29,17 @@ exports.utterances = [
   'FirstIntent utterance',
   'NamedIntent utteranceB',
   'NamedIntent utteranceC',
-  'a utterance for intent without name',
-  'b multiple',
-  'b utterances',
-  'c I am {age} years old',
-  'd My name is {name}',
+  'Multiple multiple',
+  'Multiple utterances',
+  'Age I am {age} years old',
+  'Name My name is {name}',
   'AMAZON.StopIntent one utterance',
   'AMAZON.HelpIntent two utterances',
   'AMAZON.HelpIntent yup',
   'IntentA another utterance',
   'IntentB another utterance',
   'IntentC another utterance',
-  'e async response',
+  'Async async response',
   'AnotherCardIntentSample card intent'
 ];
 

test/test-apps/basic-app.js

@@ -14,22 +14,18 @@ app.intent('NamedIntent', ['utteranceB', 'utteranceC'], () => {
   return 'All good';
 });
 
-app.intent(null, 'utterance for intent without name', () => {
-  return 'All good sir';
-});
-
-app.intent(null, ['multiple', 'utterances'], () => {
+app.intent('Multiple', ['multiple', 'utterances'], () => {
   return {
     text: 'All good sir again'
   };
 });
 
-app.intent(null, 'I am {age:Number} years old', (slots) => {
+app.intent('Age', 'I am {age:Number} years old', (slots) => {
   return `okay sir you are ${slots.age} years old`;
 });
 
 app.customSlot('Name', ['Borimir', 'Vlasto']);
-app.intent(null, 'My name is {name:Name}', (slots) => {
+app.intent('Name', 'My name is {name:Name}', (slots) => {
   return `okay sir your name is ${slots.name}`;
 });
 
@@ -71,7 +67,7 @@ app.intent('IntentC', 'another utterance', (slots, attrs) => {
   };
 });
 
-app.intent(null, 'async response', (slots, attrs, data, done) => {
+app.intent('Async', 'async response', (slots, attrs, data, done) => {
   setTimeout(() => {
     done('I just did stuff asynchronously. Thank you for this opportunity');
   }, 120);