ekms 8.9.0-beta.10 → 8.9.0-beta.12

package/common/formulas.instance.json

@@ -268,6 +268,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "hasCountOfPieces",
           "countable",

package/common/helpers/conjunction.js

@@ -0,0 +1,75 @@
+const { propertyToArray } = require('../helpers.js')
+
+const asList = (context) => {
+  if (context.marker === 'list') {
+    return context
+  }
+  return {
+    marker: 'list',
+    types: [context.marker],
+    value: [context]
+  }
+}
+
+const listable = (hierarchy) => (c, type) => {
+  if (!c) {
+    return false
+  }
+  if (hierarchy.isA(c.marker, type)) {
+    return true
+  }
+  if (c.marker === 'list') {
+    for (const t of c.types) {
+      if (hierarchy.isA(t, type)) {
+        return true
+      }
+    }
+  }
+  return false
+}
+
+const isA = (hierarchy) => (child, parent, { strict=false } = {}) => {
+  if (!child || !parent) {
+    return false
+  }
+
+  if (strict) {
+    if (child.marker) {
+      child = child.marker
+    }
+    if (parent.marker) {
+      parent = parent.marker
+    }
+    return hierarchy.isA(child, parent)
+  } else {
+    const children = propertyToArray(child)
+    for (let child of children) {
+      let okay = false
+      if (hierarchy.isA(child.marker || child, parent.marker || parent)) {
+        okay = true
+      } else {
+        for (const childT of child.types || [child]) {
+          if (okay) {
+            break
+          }
+          for (const parentT of parent.types || [parent]) {
+            if (hierarchy.isA(childT, parentT)) {
+              okay = true
+              break
+            }
+          }
+        }
+      }
+      if (!okay) {
+        return false
+      }
+    }
+    return true
+  }
+}
+
+module.exports = {
+  asList,
+  isA,
+  listable,
+}

package/common/helpers/dialogues.js

@@ -15,9 +15,15 @@ class API {
     if (typeof context == 'string') {
       return pluralize.singular(context) + this._objects.idSuffix
     } else {
-      const { unknown, value, word } = context;
+      const { unknown, value, word, raw_text } = context;
       // return unknown ? pluralize.singular(word) + this._objects.idSuffix : pluralize.singular(value || word)
-      return unknown ? pluralize.singular(word) + this._objects.idSuffix : value || pluralize.singular(word)
+      return unknown ? pluralize.singular(raw_text || word) + this._objects.idSuffix : value || pluralize.singular(word)
+      /*
+      if (raw_text && raw_text !== word) {
+        debugger
+      }
+      */
+      //return unknown ? pluralize.singular(word) + this._objects.idSuffix : value || pluralize.singular(word)
     }
   }
 

package/common/helpers/properties.js

@@ -230,8 +230,8 @@ class API {
     // config.addBridge({ id: "owner", level: 0, bridge: "{ ...next(operator) }"})
 
     {
-      const whoIsWhatVerbedBy = `${before[0].tag}Var is ${after[0].tag}Var ${edAble.word} by`
-      const thisIsVerbedByThat = `${after[0].tag}Var is ${edAble.word} by ${before[0].tag}Var`
+      const whoIsWhatVerbedBy = `${before[0].tag}var is ${after[0].tag}var ${edAble.word} by`
+      const thisIsVerbedByThat = `${after[0].tag}var is ${edAble.word} by ${before[0].tag}var`
 
       // greg32 check this out
       // config.addFragments([whoIsWhatVerbedBy])

package/common/helpers.js

@@ -163,6 +163,34 @@ const defaultContextCheck = (properties = []) => {
   ]
 }
 
+const isA = (hierarchy) => (child, parent, { strict=false } = {}) => {
+  if (!child || !parent) {
+    return false
+  }
+
+  if (strict) {
+    if (child.marker) {
+      child = child.marker
+    }
+    if (parent.marker) {
+      parent = parent.marker
+    }
+    return hierarchy.isA(child, parent)
+  } else {
+    if (hierarchy.isA(child.marker || child, parent.marker || parent)) {
+      return true
+    }
+    for (const childT of child.types || [child]) {
+      for (const parentT of parent.types || [parent]) {
+        if (hierarchy.isA(childT, parentT)) {
+          return true
+        }
+      }
+    }
+    return false
+  }
+}
+
 module.exports = {
   defaultContextCheck,
   defaultContextCheckProperties,
@@ -178,4 +206,5 @@ module.exports = {
   propertyToArray,
   wordNumber,
   requiredArgument,
+  isA,
 }

package/common/length.instance.json

@@ -244,6 +244,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -1436,6 +1441,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -3177,6 +3187,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -4583,6 +4598,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -5989,6 +6009,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -7408,6 +7433,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -8837,6 +8867,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -10266,6 +10301,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -11685,6 +11725,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -13091,6 +13136,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -14497,6 +14547,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -15903,6 +15958,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -17300,6 +17360,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -18719,6 +18784,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -20148,6 +20218,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",

package/common/math.instance.json

@@ -354,6 +354,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "hasCountOfPieces",
           "countable",

package/common/people.instance.json

@@ -4794,6 +4794,24 @@
             0
           ]
         ],
+        [
+          [
+            "isEd",
+            0
+          ],
+          [
+            "means",
+            0
+          ],
+          [
+            "owned",
+            0
+          ],
+          [
+            "owns",
+            0
+          ]
+        ],
         [
           [
             "means",
@@ -5867,10 +5885,10 @@
         ]
       ],
       "learned_contextual_priorities": [],
-      "query": "ownerVar is owneeVar owned by",
+      "query": "ownervar is owneevar owned by",
       "skipSemantics": false,
       "key": {
-        "query": "ownerVar is owneeVar owned by"
+        "query": "ownervar is owneevar owned by"
       }
     },
     {
@@ -6834,10 +6852,10 @@
         ]
       ],
       "learned_contextual_priorities": [],
-      "query": "owneeVar is owned by ownerVar",
+      "query": "owneevar is owned by ownervar",
       "skipSemantics": false,
       "key": {
-        "query": "owneeVar is owned by ownerVar"
+        "query": "owneevar is owned by ownervar"
       }
     }
   ],
@@ -7089,6 +7107,24 @@
         0
       ]
     ],
+    [
+      [
+        "isEd",
+        0
+      ],
+      [
+        "means",
+        0
+      ],
+      [
+        "owned",
+        0
+      ],
+      [
+        "owns",
+        0
+      ]
+    ],
     [
       [
         "isEd",

package/common/pipboy.instance.json

@@ -654,6 +654,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "hasCountOfPieces",
           "countable",
@@ -1932,6 +1937,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "grenade",
           "hierarchyAble",
@@ -3221,6 +3231,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",
@@ -4437,6 +4452,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",
@@ -5869,6 +5889,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",
@@ -7140,6 +7165,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",
@@ -8687,6 +8717,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",
@@ -10232,6 +10267,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",
@@ -11722,6 +11762,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",
@@ -13353,6 +13398,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",
@@ -14919,6 +14969,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",
@@ -16596,6 +16651,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",
@@ -18277,6 +18337,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",
@@ -20134,6 +20199,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",
@@ -22111,6 +22181,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",
@@ -24106,6 +24181,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",
@@ -26084,6 +26164,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "explosive",
           "hierarchyAble",

package/common/pressure.instance.json

@@ -233,6 +233,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -1443,6 +1448,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -3020,6 +3030,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",
@@ -4386,6 +4401,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "expression",
           "expression",