ekms 9.7.0 → 9.7.1-beta.1

package/common/fastfood.test.json

@@ -59466,6 +59466,12 @@
       {
         "context_id": 2,
         "context_index": 1,
+        "control": {
+          "nextId": 4,
+          "seen": [
+          ]
+        },
+        "control_id": 1,
         "default": true,
         "disqualified_floaters": [
           "quantity"
@@ -59490,11 +59496,13 @@
         "value": [
           {
             "dead": true,
+            "flatten": true,
             "instance": true,
-            "level": 0,
-            "marker": "single",
+            "level": 1,
+            "marker": "combo",
             "modifiers": [
-              "quantity"
+              "quantity",
+              "type"
             ],
             "number": 3,
             "quantity": {
@@ -59514,15 +59522,30 @@
               "word": "3"
             },
             "range": {
-              "end": 7,
+              "end": 27,
               "start": 0
             },
-            "text": "3 single",
+            "text": "3 single combos",
+            "type": {
+              "level": 0,
+              "marker": "single",
+              "number": "one",
+              "range": {
+                "end": 7,
+                "start": 2
+              },
+              "text": "single",
+              "types": [
+                "single"
+              ],
+              "value": "single",
+              "word": "single"
+            },
             "types": [
-              "single"
+              "combo"
             ],
-            "value": "single",
-            "word": "single"
+            "value": "combo",
+            "word": "combos"
           },
           {
             "dead": true,
@@ -59588,6 +59611,7 @@
         "verbatim": "What drinks do you want?"
       }
     ],
+    "developerTest": false,
     "generatedParenthesized": [
       "",
       "(What drinks do you want?)"
@@ -59696,10 +59720,14 @@
         {
           "counter": 4,
           "op": [
-            "single",
+            "comboMeal",
             0
           ],
           "ops": [
+            [
+              "comboMeal",
+              0
+            ],
             [
               "counting",
               0
@@ -59759,6 +59787,7 @@
         "asking": "asking2",
         "concept": "concept2",
         "conjunction": "conjunction2",
+        "control": "control2",
         "countable": "countable2",
         "dialogues": "dialogues2",
         "edible": "edible2",
@@ -59767,6 +59796,7 @@
         "fastfood": "fastfood1",
         "gdefaults": "gdefaults2",
         "hierarchy": "hierarchy2",
+        "logging": "logging2",
         "meta": "meta2",
         "negation": "negation2",
         "numbers": "numbers2",
@@ -59796,6 +59826,9 @@
         "conjunction2": {
           "km": "conjunction2"
         },
+        "control2": {
+          "km": "control2"
+        },
         "countable2": {
           "km": "countable2"
         },
@@ -59820,17 +59853,31 @@
           "item_id_counter": 5,
           "items": [
             {
-              "combo": false,
+              "combo": true,
               "food": {
+                "control": {
+                  "nextId": 3,
+                  "seen": [
+                    1,
+                    2
+                  ]
+                },
+                "control_id": 2,
                 "dead": true,
-                "flatten": false,
+                "flatten": true,
                 "fromSTM": true,
                 "instance": true,
-                "level": 0,
-                "marker": "single",
+                "level": 1,
+                "marker": "combo",
                 "modifiers": [
-                  "quantity"
+                  "quantity",
+                  "type"
                 ],
+                "namespaced": {
+                  "stm": {
+                    "id": 1
+                  }
+                },
                 "number": 3,
                 "pullFromContext": false,
                 "quantity": {
@@ -59850,39 +59897,66 @@
                   "word": "3"
                 },
                 "range": {
-                  "end": 7,
+                  "end": 27,
                   "start": 0
                 },
-                "stm": {
-                  "id": 1
-                },
-                "text": "3 single",
+                "text": "3 single combos",
                 "touchedBy": [
-                  "fastfood#call3"
+                  "fastfood#call4"
                 ],
+                "type": {
+                  "level": 0,
+                  "marker": "single",
+                  "number": "one",
+                  "range": {
+                    "end": 7,
+                    "start": 2
+                  },
+                  "text": "single",
+                  "types": [
+                    "single"
+                  ],
+                  "value": "single",
+                  "word": "single"
+                },
                 "types": [
-                  "single"
+                  "combo"
                 ],
-                "value": "single",
-                "word": "single"
+                "value": "combo",
+                "word": "combos"
               },
               "id": "single",
               "item_id": 0,
               "modifications": [
-              ]
+              ],
+              "needsDrink": true
             },
             {
-              "combo": false,
+              "combo": true,
               "food": {
+                "control": {
+                  "nextId": 3,
+                  "seen": [
+                    1,
+                    2
+                  ]
+                },
+                "control_id": 2,
                 "dead": true,
-                "flatten": false,
+                "flatten": true,
                 "fromSTM": true,
                 "instance": true,
-                "level": 0,
-                "marker": "single",
+                "level": 1,
+                "marker": "combo",
                 "modifiers": [
-                  "quantity"
+                  "quantity",
+                  "type"
                 ],
+                "namespaced": {
+                  "stm": {
+                    "id": 1
+                  }
+                },
                 "number": 3,
                 "pullFromContext": false,
                 "quantity": {
@@ -59902,39 +59976,66 @@
                   "word": "3"
                 },
                 "range": {
-                  "end": 7,
+                  "end": 27,
                   "start": 0
                 },
-                "stm": {
-                  "id": 1
-                },
-                "text": "3 single",
+                "text": "3 single combos",
                 "touchedBy": [
-                  "fastfood#call3"
+                  "fastfood#call4"
                 ],
+                "type": {
+                  "level": 0,
+                  "marker": "single",
+                  "number": "one",
+                  "range": {
+                    "end": 7,
+                    "start": 2
+                  },
+                  "text": "single",
+                  "types": [
+                    "single"
+                  ],
+                  "value": "single",
+                  "word": "single"
+                },
                 "types": [
-                  "single"
+                  "combo"
                 ],
-                "value": "single",
-                "word": "single"
+                "value": "combo",
+                "word": "combos"
               },
               "id": "single",
               "item_id": 1,
               "modifications": [
-              ]
+              ],
+              "needsDrink": true
             },
             {
-              "combo": false,
+              "combo": true,
               "food": {
+                "control": {
+                  "nextId": 3,
+                  "seen": [
+                    1,
+                    2
+                  ]
+                },
+                "control_id": 2,
                 "dead": true,
-                "flatten": false,
+                "flatten": true,
                 "fromSTM": true,
                 "instance": true,
-                "level": 0,
-                "marker": "single",
+                "level": 1,
+                "marker": "combo",
                 "modifiers": [
-                  "quantity"
+                  "quantity",
+                  "type"
                 ],
+                "namespaced": {
+                  "stm": {
+                    "id": 1
+                  }
+                },
                 "number": 3,
                 "pullFromContext": false,
                 "quantity": {
@@ -59954,32 +60055,52 @@
                   "word": "3"
                 },
                 "range": {
-                  "end": 7,
+                  "end": 27,
                   "start": 0
                 },
-                "stm": {
-                  "id": 1
-                },
-                "text": "3 single",
+                "text": "3 single combos",
                 "touchedBy": [
-                  "fastfood#call3"
+                  "fastfood#call4"
                 ],
+                "type": {
+                  "level": 0,
+                  "marker": "single",
+                  "number": "one",
+                  "range": {
+                    "end": 7,
+                    "start": 2
+                  },
+                  "text": "single",
+                  "types": [
+                    "single"
+                  ],
+                  "value": "single",
+                  "word": "single"
+                },
                 "types": [
-                  "single"
+                  "combo"
                 ],
-                "value": "single",
-                "word": "single"
+                "value": "combo",
+                "word": "combos"
               },
               "id": "single",
               "item_id": 2,
               "modifications": [
-              ]
+              ],
+              "needsDrink": true
             },
             {
               "combo": true,
               "food": {
+                "control": {
+                  "nextId": 4,
+                  "seen": [
+                    3
+                  ]
+                },
+                "control_id": 3,
                 "dead": true,
-                "flatten": false,
+                "flatten": true,
                 "fromSTM": true,
                 "instance": true,
                 "level": 1,
@@ -59988,6 +60109,11 @@
                   "quantity",
                   "type"
                 ],
+                "namespaced": {
+                  "stm": {
+                    "id": 2
+                  }
+                },
                 "number": 2,
                 "pullFromContext": false,
                 "quantity": {
@@ -60010,12 +60136,9 @@
                   "end": 27,
                   "start": 13
                 },
-                "stm": {
-                  "id": 2
-                },
                 "text": "2 double combos",
                 "touchedBy": [
-                  "fastfood#call4"
+                  "fastfood#call6"
                 ],
                 "type": {
                   "level": 0,
@@ -60047,8 +60170,15 @@
             {
               "combo": true,
               "food": {
+                "control": {
+                  "nextId": 4,
+                  "seen": [
+                    3
+                  ]
+                },
+                "control_id": 3,
                 "dead": true,
-                "flatten": false,
+                "flatten": true,
                 "fromSTM": true,
                 "instance": true,
                 "level": 1,
@@ -60057,6 +60187,11 @@
                   "quantity",
                   "type"
                 ],
+                "namespaced": {
+                  "stm": {
+                    "id": 2
+                  }
+                },
                 "number": 2,
                 "pullFromContext": false,
                 "quantity": {
@@ -60079,12 +60214,9 @@
                   "end": 27,
                   "start": 13
                 },
-                "stm": {
-                  "id": 2
-                },
                 "text": "2 double combos",
                 "touchedBy": [
-                  "fastfood#call4"
+                  "fastfood#call6"
                 ],
                 "type": {
                   "level": 0,
@@ -60126,6 +60258,11 @@
         "hierarchy2": {
           "km": "hierarchy2"
         },
+        "logging2": {
+          "km": "logging2",
+          "messages": [
+          ]
+        },
         "meta2": {
           "km": "meta2"
         },
@@ -60141,6 +60278,8 @@
         "properties2": {
           "children": {
             "adjective": [
+              "stm_previous",
+              "stm_current",
               "stm_before"
             ],
             "article": [
@@ -60187,6 +60326,9 @@
               "wild_berry",
               "strawberry_banana"
             ],
+            "deletable": [
+              "memorable"
+            ],
             "drink": [
               "milk",
               "pop",
@@ -60354,6 +60496,9 @@
               "memorable",
               "noun"
             ],
+            "thisAble": [
+              "noun"
+            ],
             "thisitthat": [
               "it",
               "this",
@@ -60379,6 +60524,8 @@
               "modifies",
               "is",
               "isQuery",
+              "delete",
+              "recall",
               "remember"
             ]
           },
@@ -60420,18 +60567,24 @@
             "to",
             "isQuery",
             "reason",
+            "orAble",
+            "ifAble",
+            "delete",
             "memorable",
+            "deletable",
+            "recall",
             "remember",
-            "stm_before",
+            "stm_previous",
             "adjective",
-            "orAble",
-            "ifAble",
+            "stm_current",
+            "stm_before",
             "each",
             "every",
             "distributable",
             "noun",
             "thisitthat",
             "that",
+            "thisAble",
             "food",
             "edible",
             "drink",
@@ -60620,6 +60773,9 @@
             "crispy_chicken": [
               "kid_meal"
             ],
+            "delete": [
+              "verb"
+            ],
             "diet_coke": [
               "pop"
             ],
@@ -60749,7 +60905,8 @@
               "food"
             ],
             "memorable": [
-              "theAble"
+              "theAble",
+              "deletable"
             ],
             "milk": [
               "drink"
@@ -60764,7 +60921,8 @@
               "queryable"
             ],
             "noun": [
-              "theAble"
+              "theAble",
+              "thisAble"
             ],
             "nugget": [
               "food",
@@ -60829,6 +60987,9 @@
               "theAble",
               "queryable"
             ],
+            "recall": [
+              "verb"
+            ],
             "remember": [
               "verb"
             ],
@@ -60864,6 +61025,12 @@
             "stm_before": [
               "adjective"
             ],
+            "stm_current": [
+              "adjective"
+            ],
+            "stm_previous": [
+              "adjective"
+            ],
             "strawberry": [
               "countable",
               "smoothie_ingredient"
@@ -61011,6 +61178,10 @@
               },
               "crispy_chicken": {
               },
+              "deletable": {
+              },
+              "delete": {
+              },
               "diet_coke": {
               },
               "distributable": {
@@ -61147,6 +61318,8 @@
               },
               "reason": {
               },
+              "recall": {
+              },
               "remember": {
               },
               "salad": {
@@ -61173,6 +61346,10 @@
               },
               "stm_before": {
               },
+              "stm_current": {
+              },
+              "stm_previous": {
+              },
               "strawberry": {
               },
               "strawberry_banana": {
@@ -61189,6 +61366,8 @@
               },
               "this": {
               },
+              "thisAble": {
+              },
               "thisitthat": {
               },
               "to": {
@@ -61241,8 +61420,15 @@
           "km": "stm2",
           "mentioned": [
             {
+              "control": {
+                "nextId": 4,
+                "seen": [
+                  3
+                ]
+              },
+              "control_id": 3,
               "dead": true,
-              "flatten": false,
+              "flatten": true,
               "fromSTM": true,
               "instance": true,
               "level": 1,
@@ -61251,6 +61437,11 @@
                 "quantity",
                 "type"
               ],
+              "namespaced": {
+                "stm": {
+                  "id": 2
+                }
+              },
               "number": 2,
               "pullFromContext": false,
               "quantity": {
@@ -61273,12 +61464,9 @@
                 "end": 27,
                 "start": 13
               },
-              "stm": {
-                "id": 2
-              },
               "text": "2 double combos",
               "touchedBy": [
-                "fastfood#call4"
+                "fastfood#call6"
               ],
               "type": {
                 "level": 0,
@@ -61302,15 +61490,29 @@
               "word": "combos"
             },
             {
+              "control": {
+                "nextId": 3,
+                "seen": [
+                  1,
+                  2
+                ]
+              },
+              "control_id": 2,
               "dead": true,
-              "flatten": false,
+              "flatten": true,
               "fromSTM": true,
               "instance": true,
-              "level": 0,
-              "marker": "single",
+              "level": 1,
+              "marker": "combo",
               "modifiers": [
-                "quantity"
+                "quantity",
+                "type"
               ],
+              "namespaced": {
+                "stm": {
+                  "id": 1
+                }
+              },
               "number": 3,
               "pullFromContext": false,
               "quantity": {
@@ -61330,21 +61532,33 @@
                 "word": "3"
               },
               "range": {
-                "end": 7,
+                "end": 27,
                 "start": 0
               },
-              "stm": {
-                "id": 1
-              },
-              "text": "3 single",
+              "text": "3 single combos",
               "touchedBy": [
-                "fastfood#call3"
+                "fastfood#call4"
               ],
+              "type": {
+                "level": 0,
+                "marker": "single",
+                "number": "one",
+                "range": {
+                  "end": 7,
+                  "start": 2
+                },
+                "text": "single",
+                "types": [
+                  "single"
+                ],
+                "value": "single",
+                "word": "single"
+              },
               "types": [
-                "single"
+                "combo"
               ],
-              "value": "single",
-              "word": "single"
+              "value": "combo",
+              "word": "combos"
             }
           ],
           "variables": {
@@ -61383,6 +61597,12 @@
           "context": {
             "context_id": 2,
             "context_index": 1,
+            "control": {
+              "nextId": 4,
+              "seen": [
+              ]
+            },
+            "control_id": 1,
             "default": true,
             "disqualified_floaters": [
               "quantity"
@@ -61407,11 +61627,13 @@
             "value": [
               {
                 "dead": true,
+                "flatten": true,
                 "instance": true,
-                "level": 0,
-                "marker": "single",
+                "level": 1,
+                "marker": "combo",
                 "modifiers": [
-                  "quantity"
+                  "quantity",
+                  "type"
                 ],
                 "number": 3,
                 "quantity": {
@@ -61431,15 +61653,30 @@
                   "word": "3"
                 },
                 "range": {
-                  "end": 7,
+                  "end": 27,
                   "start": 0
                 },
-                "text": "3 single",
+                "text": "3 single combos",
+                "type": {
+                  "level": 0,
+                  "marker": "single",
+                  "number": "one",
+                  "range": {
+                    "end": 7,
+                    "start": 2
+                  },
+                  "text": "single",
+                  "types": [
+                    "single"
+                  ],
+                  "value": "single",
+                  "word": "single"
+                },
                 "types": [
-                  "single"
+                  "combo"
                 ],
-                "value": "single",
-                "word": "single"
+                "value": "combo",
+                "word": "combos"
               },
               {
                 "dead": true,
@@ -62031,13 +62268,7 @@
               "value": "crispy_chicken_club",
               "word": "club"
             },
-            "context_id": null,
-            "context_index": 1,
-            "dead": true,
-            "flatten": false,
-            "level": 1,
-            "marker": "modifies",
-            "modifiers": [
+            "conceptModifiers": [
               {
                 "dead": true,
                 "level": 1,
@@ -62052,6 +62283,12 @@
                 "word": "junior"
               }
             ],
+            "context_id": null,
+            "context_index": 1,
+            "dead": true,
+            "flatten": false,
+            "level": 1,
+            "marker": "modifies",
             "number": "one",
             "range": {
               "end": 34,
@@ -62270,11 +62507,11 @@
       ]
     },
     "paraphrases": [
-      "3 singles and 2 double combos",
+      "3 single combos and 2 double combos",
       "What drinks do you want?"
     ],
     "paraphrasesParenthesized": [
-      "(((3) (singles)) and ((2) (double) (combos)))",
+      "(((3) (single) (combos)) and ((2) (double) (combos)))",
       "(What drinks do you want?)"
     ],
     "query": "3 single and 2 double combos",
@@ -62551,11 +62788,11 @@
               },
               {
                 "marker": [
-                  "single",
-                  0
+                  "combo",
+                  1
                 ],
                 "range": {
-                  "end": 7,
+                  "end": 27,
                   "start": 2
                 }
               },
@@ -62596,11 +62833,11 @@
             "operators": [
               {
                 "marker": [
-                  "single",
-                  0
+                  "combo",
+                  1
                 ],
                 "range": {
-                  "end": 7,
+                  "end": 27,
                   "start": 0
                 }
               },
@@ -62641,11 +62878,11 @@
             "operators": [
               {
                 "marker": [
-                  "single",
-                  0
+                  "combo",
+                  1
                 ],
                 "range": {
-                  "end": 7,
+                  "end": 27,
                   "start": 0
                 }
               },