tpmkms_4wp 8.9.0 → 8.9.1-beta.1

package/common/formulas.instance.json

@@ -268,6 +268,11 @@
           "verb",
           false
         ],
+        [
+          "every",
+          "quantifier",
+          false
+        ],
         [
           "hasCountOfPieces",
           "countable",
@@ -468,6 +473,11 @@
           "verb",
           false
         ],
+        [
+          "negatable",
+          "queryable",
+          false
+        ],
         [
           "noun",
           "theAble",

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)
     }
   }
 
@@ -71,7 +77,7 @@ class API {
   }
 
   // word is for one or many
-  makeObject({config, context, types=[], doPluralize=true} = {}) {
+  makeObject({config, context, types=[], source_value=undefined, doPluralize=true} = {}) {
     /*
     if (!context.unknown) {
       return context.value
@@ -83,9 +89,9 @@ class API {
     }
     // const concept = pluralize.singular(value)
     const concept = this.toScopedId(context)
-		if (config.exists(concept)) {
-			return concept
-		}
+    if (config.exists(concept)) {
+      return concept
+    }
 
     // TODO handle the general case
     const fixUps = (concept) => {
@@ -96,9 +102,9 @@ class API {
     }
     // config.addOperator({ pattern: `(["${fixUps(concept)}"])`, allowDups: true })
     config.addOperator({ pattern: `(["${concept}"])`, allowDups: true })
-    config.addBridge({ id: concept, level: 0, bridge: `{ ...next(operator), value: '${concept}' }` , allowDups: true })
+    config.addBridge({ id: concept, level: 0, bridge: `{ ...next(operator), value: '${source_value || concept}' }` , allowDups: true })
     const addConcept = (word, number) => {
-      config.addWord(word, { id: concept, initial: `{ value: "${concept}", number: "${number}" }` } )
+      config.addWord(word, { id: concept, initial: `{ value: "${source_value || concept}", number: "${number}" }` } )
       const baseTypes = [
         'theAble',
         'queryable',

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/hierarchy.js

@@ -252,9 +252,9 @@ let config = {
         const twoConcepts = asList(context.same);
         for (let oneConcept of oneConcepts.value) {
           for (let twoConcept of twoConcepts.value) {
-            oneConcept = api.makeObject({config, context: oneConcept})
-            twoConcept = api.makeObject({config, context: twoConcept})
-            api.rememberIsA(oneConcept, twoConcept)
+            oneConceptId = api.makeObject({config, context: oneConcept})
+            twoConceptId = api.makeObject({config, context: twoConcept})
+            api.rememberIsA(oneConceptId, twoConceptId)
             context.sameWasProcessed = true
           }
         }
@@ -305,8 +305,8 @@ knowledgeModule( {
     checks: {
       objects: ['children', 'concept', 'parents', 'properties'],
       checks: {
-            context: defaultContextCheck(),
-          },
+        context: defaultContextCheck(),
+      },
 
     },
     includes: {