Skip to content
This repository was archived by the owner on Apr 24, 2025. It is now read-only.

Commit 8171fa2

Browse files
authored
🔀 Merge pull request #101 from jovotech/v4/dev
🔖 Prepare latest release
2 parents 19aea41 + ba3997a commit 8171fa2

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

packages/jovo-model-alexa/src/JovoModelAlexa.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,10 @@ export class JovoModelAlexa extends JovoModel {
294294
}
295295
}
296296

297+
const alexaLanguageModelIntents = _get(model, 'alexa.interactionModel.languageModel.intents') || [];
297298
// convert alexa specific intents
298-
if (_get(model, 'alexa.interactionModel.languageModel.intents')) {
299-
for (const intent of _get(model, 'alexa.interactionModel.languageModel.intents')) {
299+
if (alexaLanguageModelIntents) {
300+
for (const intent of alexaLanguageModelIntents) {
300301
alexaIntents.push(intent);
301302
}
302303
}

packages/jovo-model-dialogflow/src/JovoModelDialogflow.ts

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -477,9 +477,11 @@ export class JovoModelDialogflow extends JovoModel {
477477
});
478478
}
479479
}
480+
// tslint:disable-next-line:no-any
481+
const dialogFlowIntents =_get(model, 'dialogflow.intents') as any;
480482
// dialogflow intents form locale.json
481-
if (_get(model, 'dialogflow.intents')) {
482-
for (const modelDialogflowIntent of _get(model, 'dialogflow.intents')) {
483+
if (dialogFlowIntents) {
484+
for (const modelDialogflowIntent of dialogFlowIntents) {
483485
// user says
484486
if (modelDialogflowIntent.userSays) {
485487
returnFiles.push({
@@ -496,9 +498,11 @@ export class JovoModelDialogflow extends JovoModel {
496498
}
497499
}
498500

501+
// tslint:disable-next-line:no-any
502+
const dialogFlowEntities = _get(model, 'dialogflow.entities') as any;
499503
// dialogflow entities form locale.json
500-
if (_get(model, 'dialogflow.entities')) {
501-
for (const modelDialogflowEntity of _get(model, 'dialogflow.entities')) {
504+
if (dialogFlowEntities) {
505+
for (const modelDialogflowEntity of dialogFlowEntities) {
502506
// entries
503507
if (modelDialogflowEntity.entries) {
504508
returnFiles.push({
@@ -606,13 +610,15 @@ export class JovoModelDialogflow extends JovoModel {
606610
);
607611
}
608612

613+
// tslint:disable-next-line:no-any
614+
const dialogFlowIntentResponseMessages = _get(dialogFlowIntent, 'responses[0].messages') as any;
609615
if (
610616
!_isEqual(
611-
_get(dialogFlowIntent, 'responses[0].messages'),
617+
dialogFlowIntentResponseMessages,
612618
_get(DEFAULT_INTENT, 'responses[0].messages'),
613619
)
614620
) {
615-
for (const message of _get(dialogFlowIntent, 'responses[0].messages')) {
621+
for (const message of dialogFlowIntentResponseMessages) {
616622
if (_get(message, 'lang') === locale) {
617623
const jovoIntentDialogflowMessages = _get(
618624
jovoIntent,
@@ -621,7 +627,8 @@ export class JovoModelDialogflow extends JovoModel {
621627
);
622628

623629
if (_get(message, 'speech', '').length > 0) {
624-
jovoIntentDialogflowMessages.push(message);
630+
// @ts-ignore
631+
jovoIntentDialogflowMessages.push(message);
625632
_set(jovoIntent, 'dialogflow.responses[0].messages', jovoIntentDialogflowMessages);
626633
}
627634
}

packages/jovo-model-google/src/JovoModelGoogle.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,8 @@ export class JovoModelGoogle extends JovoModel {
371371

372372
jovoModel.entityTypes![modelName] = jovoEntity;
373373
} else {
374-
const props: GoogleActionLanguageModelProperty[] = _get(
374+
// @ts-ignore
375+
const props: GoogleActionLanguageModelProperty[] = _get(
375376
jovoModel,
376377
`googleAssistant.custom.${modelType}`,
377378
{},

0 commit comments

Comments
 (0)