tpmkms_4wp 8.9.1-beta.2 → 8.9.1-beta.21

package/common/fastfood.js

@@ -275,7 +275,7 @@ const template = {
         { context: [['meal', 0], ['list', 0], ['meal', 0], ['comboMeal', 0]], ordered: true, choose: [0,1,2] },
         // { context: [['crispy_chicken_club', 0], ['chicken_club', 0], ['chicken_sandwich', 0]], choose: [0] },
         { context: [['breakfast_baconator', 0], ['breakfast_meal', 0]], choose: [0] },
-        { context: [['list', 0], ['articlePOS',0], ['smoothie_ingredient', 0], ['smoothie', 0]], ordered: true, choose: [1,2] },
+        { context: [['list', 0], ['article',0], ['smoothie_ingredient', 0], ['smoothie', 0]], ordered: true, choose: [1,2] },
       ]
     },
     // { stop: true },
@@ -323,7 +323,7 @@ const template = {
 
       const hasDrink = (isA, item) => {
         let hasDrink = false
-        for (let modification of (item.modifications || [])) {
+        for (const modification of (item.modifications || [])) {
           if (isA(modification.id, 'drink')) {
             hasDrink = true
             break
@@ -385,7 +385,7 @@ const template = {
             const { api, context } = args
             if (isMany(context)) {
               let count = getCount(context) || Number.MAX_SAFE_INTEGER
-              for (let item of needsDrink) {
+              for (const item of needsDrink) {
                 if (count < 1) {
                   break
                 }
@@ -534,8 +534,19 @@ class API {
     return [...this._objects.items]
   }
 
+  fixUpItemId(item) {
+    if (item.id == 'coke') {
+      item.id = 'coca_cola'
+    }
+
+    if (item.id == 'fry') {
+      item.id = 'french_fry'
+    }
+  }
+
   addDrink(item_id, drink) {
     const item = this.toItem(item_id)
+    this.fixUpItemId(drink)
     item.modifications.push(drink)
     item.needsDrink = false
   }
@@ -598,7 +609,7 @@ class API {
 
     if (item.combo) {
       item.needsDrink = true 
-      for (let modification of item.modifications || []) {
+      for (const modification of item.modifications || []) {
         // TODO check for awailable
         if (this.args.isA(modification.id, 'drink')) {
           item.needsDrink = false
@@ -606,13 +617,8 @@ class API {
       }
     }
 
-    if (item.id == 'coke') {
-      item.id = 'coca_cola'
-    }
 
-    if (item.id == 'fry') {
-      item.id = 'french_fry'
-    }
+    this.fixUpItemId(item)
 
     return [
       "hamburger",

package/common/formulas.instance.json

@@ -115,7 +115,7 @@
       "hierarchy": [
         [
           "a",
-          "articlePOS",
+          "article",
           false
         ],
         [
@@ -129,8 +129,8 @@
           false
         ],
         [
-          "articlePOS",
-          "articlePOS",
+          "article",
+          "article",
           false
         ],
         [
@@ -248,6 +248,11 @@
           "theAble",
           false
         ],
+        [
+          "distributable",
+          "queryable",
+          false
+        ],
         [
           "divideByExpression",
           "mathematicalExpression",
@@ -263,6 +268,11 @@
           "queryable",
           false
         ],
+        [
+          "each",
+          "article",
+          false
+        ],
         [
           "evaluate",
           "verb",
@@ -270,7 +280,7 @@
         ],
         [
           "every",
-          "quantifier",
+          "article",
           false
         ],
         [
@@ -780,7 +790,7 @@
         ],
         [
           "the",
-          "articlePOS",
+          "article",
           false
         ],
         [
@@ -1009,6 +1019,7 @@
           },
           "dead": true,
           "level": 2,
+          "context_index": 1,
           "topLevel": true,
           "touchedBy": [
             "formulas#call2"

package/common/formulas.js

@@ -91,7 +91,7 @@ class API {
 }
 */
 
-let config = {
+const config = {
   name: 'formulas',
   operators: [
     // TODO notations like (([arg1:]) [op] ([arg2:nameOfArg2}|word1])) -> just make the bridge + operators. put this in the bridge def / also calculate generators