ekms 7.12.4-beta.1 → 7.12.4-beta.3

package/common/fastfood.js

@@ -30,6 +30,8 @@ const fastfood_instance = require('./fastfood.instance.json')
   double hamburger
   number 1 and 2
   number 1 2 and 3
+  combo 1 through 5
+
 */
 
 const template = {
@@ -348,6 +350,18 @@ const template = {
         {
           where: where(),
           oneShot: false,
+          onNevermind: ({verbatim, ...args}) => {
+            // this is cross km boundaries from the dialogues km to this one so the api if for dialogs. 
+            // i need to get the one for fastfood here.
+            const api = args.kms.fastfood.api
+            const needsDrink = askAbout({ args, api })
+            if (needsDrink.length > 1) {
+              verbatim("The drinks must be specified")
+            } else {
+              verbatim("The drink must be specified")
+            }
+            return false
+          },
           matchq: (args) => askAbout(args).length > 0 && args.context.marker == 'controlEnd',
           applyq: (args) => {
             args.context.cascade = true
@@ -411,7 +425,7 @@ const template = {
             const to = state.getIdCombo(context.to)
             for (const item of api.items()) {
               if (item.id == from.id) {
-                api.modify(item, { id: to.id })
+                api.modify(item, { id: to.id, food: context.to })
               }
             }
           }
@@ -432,6 +446,35 @@ const template = {
         { context: [['combo', 2], ['list', 0], ['combo', 1], ['withModification', 1]], ordered: true, choose: [3] },
       ],
     },
+    {
+      operators: [
+        "([remove|remove,delete,drop,ditch,forget,no] (food/*))",
+        "([reset|reset,restart,clear])",
+      ],
+      bridges: [
+        {
+          id: 'remove',
+          isA: ['verby'],
+          bridge: "{ ...next(operator), remove: after[0], postModifiers: ['remove'] }",
+          semantic: ({context, api}) => {
+            const state = api.state
+            for (const item of api.items()) {
+              if (state.match(context.remove, item)) {
+                api.remove(item)
+              }
+            }
+          }
+        },
+        {
+          id: 'reset',
+          isA: ['verby'],
+          bridge: "{ ...next(operator) }",
+          semantic: ({context, api}) => {
+            api.reset()
+          }
+        },
+      ],
+    },
   ],
 }
 
@@ -441,28 +484,53 @@ class API {
     this._objects.items = []
     this._objects.notAvailable = []
     this._objects.notAvailableModification = []
+    this._objects.item_id_counter = 0
   }
 
   show() {
     this._objects.show = this._objects.items
   }
 
+  toItem(item_id) {
+    if (Array.isArray(item_id)) {
+      return this._objects.items[item_id[0]].modifications[item_id[1]]
+    } else {
+      return this._objects.items[item_id]
+    }
+  }
+
+  new_item_id() {
+    const item_id = this._objects.item_id_counter
+    this._objects.item_id_counter += 1
+    return item_id
+  }
+
   // returns an item id so things can be updated if needed
   add(item) {
-    item.item_id = this._objects.items.length
+    item.item_id = this.new_item_id()
     if (!item.modifications) {
       item.modifications = []
     }
+    item.modifications.forEach((modification, index) => {
+      modification.item_id = [item.item_id, index]
+    })
     this._objects.items.push(item)
-    return item.item_id 
+  }
+
+  reset() {
+    this._objects.items = []
   }
 
   get(item_id) {
-    return this._objects.items[item_id]
+    return this.toItem(item_id)
   }
 
   modify(item, changes) {
-    Object.assign(this._objects.items[item.item_id], changes)
+    Object.assign(this.toItem(item.item_id), changes)
+  }
+
+  remove(item) {
+    this._objects.items = this._objects.items.filter( (i) => i.item_id !== item.item_id )
   }
 
   items() {
@@ -470,8 +538,9 @@ class API {
   }
 
   addDrink(item_id, drink) {
-    this._objects.items[item_id].modifications.push(drink)
-    this._objects.items[item_id].needsDrink = false
+    const item = this.toItem(item_id)
+    item.modifications.push(drink)
+    item.needsDrink = false
   }
 
   say(response) {
@@ -638,6 +707,27 @@ class API {
     }
     return map[number]
   }
+
+  canBeCombo(id) {
+    return this.getComboNumber(id) > 0
+  }
+
+  getComboNumber(id) {
+    const combos = [
+       'single',
+       'double',
+       'triple',
+       'baconator',
+       'bacon_deluxe',
+       'spicy',
+       'homestyle',
+       'asiago_range_chicken_club',
+       'ultimate_chicken_grill',
+       'chicken_nugget',
+       'premium_cod',
+       ]
+    return combos.findIndex((e) => e == id) + 1
+  }
 }
 
 const api = new API()
@@ -665,7 +755,7 @@ class State {
       }
       combo = true
     } else if (food.marker == 'combo') {
-      id = food.type.value
+      id = food.type?.value
       combo = true
     } else {
       id = food.value
@@ -679,6 +769,18 @@ class State {
     return { id, combo }
   }
 
+  match(pattern, item) {
+    Object.assign(pattern, this.getIdCombo(pattern))
+    if (pattern.id == item.id) {
+      return true
+    }
+    if (!pattern.id) {
+      if (pattern.combo == item.combo) {
+        return true
+      }
+    }
+  }
+
   add(food) {
     let quantity = 1
     if (food.quantity) {
@@ -746,7 +848,66 @@ class State {
     for (let i = 0; i < quantity; ++i) {
       const item = addSize(food, { id, combo, modifications, pieces, food })
       if (!this.api.isAvailable(item)) {
-        this.api.addAskedForButNotAvailable(food)
+        const available = []
+        for (const descendant of this.api.args.hierarchy.descendants(food.marker)) {
+          if (this.api.isAvailable({ id: descendant })) {
+            available.push(descendant)
+          }
+        }
+
+          // this sentence runs but it doesnt setup the hierarchy: 'combo 1, 2, 3, 4, 5, 6, 7, 9, 10, and 11 are combos'
+          // i made a wrong design choice when i setup the phrase 'combo 1 etc'. I should have mapped that to the 'single_combo'
+          // but instead had it be a combo with a comboNumber property. That means the language layer doesnt know about the mapping
+          // so that phrase doesnt work. if I set it up the other way that phrase would work. This is just a demo and I have other
+          // demoes to write so i am not fixin that and instead will do || is a combo
+
+        if (available.length > 0 || food.marker == 'combo') {
+          this.api.args.ask([
+            {
+              where: where(),
+              oneShot: true,
+              matchq: ({context}) => context.marker == 'controlEnd',
+              applyq: () => {
+                // args.context.cascade = true
+                const word = food.word
+                return `What kind of ${word}?`
+              },
+              semanticsr: [
+                // stuipid hack one because i didnt put combo fully into the NLI layer
+                {
+                  where: where(),
+                  match: ({context, callId, isA, api}) => {
+                    return api.canBeCombo(context.marker)
+                  },
+                  apply: ({context}) => {
+                    const comboNumber = {
+                      value: api.getComboNumber(context.marker)
+                    }
+                    food.comboNumber = comboNumber
+                    this.add(food)
+                  }
+                },
+                {
+                  where: where(),
+                  match: ({context, isA}) => isA(context.marker, food.marker),
+                  apply: ({context}) => {
+                    this.add(Object.assign(food, context))
+                  }
+                },
+                {
+                  where: where(),
+                  match: ({context, isA}) => isA(context.marker, `${food.marker}_modifier`),
+                  apply: ({context}) => {
+                    const value = `${context.value}_${food.value}`
+                    this.add(Object.assign(food, { value }))
+                  }
+                },
+              ]
+            },
+          ])
+        } else {
+          this.api.addAskedForButNotAvailable(food)
+        }
         return
       }
 
@@ -844,7 +1005,19 @@ knowledgeModule( {
             checks: {
               objects: [
                 'show', 
-                { property: 'items', filter: ['combo', 'pieces', 'size', 'item_id', 'id', 'modifications', 'needsDrink'] },
+                { 
+                  property: 'items', 
+                  filter: [
+                      'combo', 
+                      'pieces', 
+                      'size', 
+                      'item_id', 
+                      'id', 
+                      { property: 'food', filter: [ 'marker', 'value', 'text' ] }, 
+                      { property: 'modifications', filter: [ 'id', 'item_id', 'food' ] }, 
+                      'needsDrink'
+                  ],
+                },
                 'changes', 
                 'response', 
                 { property: 'notAvailable', filter: [ 'marker', 'value', 'text' ] },