tpmkms 9.8.0 → 9.9.0

package/common/helpers.js

@@ -1,5 +1,6 @@
 const pluralize = require('pluralize')
-const { flatten } = require('./runtime').theprogrammablemind
+const { flatten, debug } = require('./runtime').theprogrammablemind
+// const { asList } = require('./helpers/conjunction.js')
 
 /**
  * Memoize an async function.
@@ -101,6 +102,10 @@ function isMany(context) {
     }
   }
 
+  if (context.isPropertyValue) {
+    return false
+  }
+
   let number = context.number
   if (context.quantity) {
     if (context.quantity.number) {
@@ -159,10 +164,29 @@ function zip(...arrays) {
 
 function focus(context) {
   function helper(context) {
-    if (!context || !context.focusable) {
+    let focusable = context?.focusable
+    if (!focusable && context.marker == 'list') {
+      focusable = ['value']
+    }
+    if (!focusable) {
       return null
     }
-    for (const property of context.focusable) {
+    for (const property of focusable) {
+      if (Array.isArray(context[property])) {
+        const array = context[property]
+        const focussed = []
+        for (const value of array) {
+          const focus = helper(value)
+          if (focus) {
+            focussed.push(focus)
+          }
+        }
+        if (focussed) {
+          return focussed
+        }
+        continue
+      }
+
       let focus = helper(context[property])
       if (!focus) {
         const flat = flatten(['list'], context[property])[0]
@@ -228,7 +252,7 @@ function toEValue(context) {
 }
 
 function toFinalValue(context) {
-  while( context.evalue || context.value ) {
+  while( context?.evalue || context?.value ) {
     if (context.evalue) {
       context = context.evalue
     } else {
@@ -259,7 +283,6 @@ function defaultContextCheck({marker, extra = [], exported = false} = {}) {
   if (marker) {
     match = ({context}) => context.marker == marker
   } else {
-    match = () => true
   }
   return {
     marker,
@@ -380,58 +403,6 @@ async function processTemplateString(template, evaluate) {
   return await processTemplateString(template)
 }
 
-// removeProp.js
-function removeProp(obj, testFn, { maxDepth = Infinity, seen = new WeakSet() } = {}) {
-  if (!obj || typeof obj !== 'object' || maxDepth <= 0) return obj;
-  if (seen.has(obj)) return obj;
-  seen.add(obj);
-
-  if (Array.isArray(obj)) {
-    // ---- ARRAY: process each element (but don't remove elements unless testFn says so)
-    let writeIdx = 0;
-    for (let i = 0; i < obj.length; i++) {
-      const element = obj[i];
-      const shouldRemoveElement = testFn(element, i, obj);
-
-      if (shouldRemoveElement) {
-        // Remove the whole array element
-        if (element && typeof element === 'object') {
-          // Still walk inside it in case testFn wants side effects
-          removeProp(element, testFn, { maxDepth: maxDepth - 1, seen });
-        }
-        // Skip writing it back
-      } else {
-        // Keep element, but walk into it to remove inner props
-        removeProp(element, testFn, { maxDepth: maxDepth - 1, seen });
-        if (writeIdx !== i) {
-          obj[writeIdx] = element;
-        }
-        writeIdx++;
-      }
-    }
-    obj.length = writeIdx;
-    return obj;
-  }
-
-  // ---- OBJECT: iterate over own keys
-  const keys = Reflect.ownKeys(obj);
-  for (const key of keys) {
-    const val = obj[key];
-    const shouldRemove = testFn(val, key, obj);
-
-    if (shouldRemove) {
-      delete obj[key];
-      if (val && typeof val === 'object') {
-        removeProp(val, testFn, { maxDepth: maxDepth - 1, seen });
-      }
-    } else {
-      removeProp(val, testFn, { maxDepth: maxDepth - 1, seen });
-    }
-  }
-
-  return obj;
-}
-
 module.exports = {
   processTemplateString,
   unshiftL,
@@ -457,7 +428,6 @@ module.exports = {
   wordNumber,
   requiredArgument,
   isA,
-  removeProp,
   concats,
   memoizeAsync,
 }

package/common/hierarchy.js

@@ -15,7 +15,7 @@ function getTypes( km, digraph, concept, instance ) {
     return new Set([...set1].filter(x => set2.has(x)))
   }
   const descendants = digraph.descendants(concept.value || concept.marker)
-  const ancestors = digraph.ancestors(instance.evalue)
+  const ancestors = digraph.ancestors(instance.evalue || instance.value)
   const common = intersect(ancestors, descendants)
   const answer = Array.from(digraph.minima(common))
   const words = answer.map( (value) => conceptAPI.getWordForValue(value) )
@@ -66,7 +66,14 @@ const config = {
     {
       notes: 'what type is pikachu',
       where: where(),
-      match: ({context, hierarchy}) => hierarchy.isA(context.marker, 'is') && context.query && !['what'].includes(context.one.marker) && !['what'].includes(context.two.marker) && (context.one.query || context.two.query),
+      match: ({context, hierarchy}) => 
+          hierarchy.isA(context.marker, 'is') && 
+          context.query && 
+          !context.one.pullFromContext &&
+          (context.one?.marker == 'type' || context.two?.marker == 'type') &&
+          !['what'].includes(context.one.marker) && 
+          !['what'].includes(context.two.marker) && 
+          (context.one.query || context.two.query),
       apply: async ({context, hierarchy, km, log, e}) => {
         const one = context.one;
         const two = context.two;
@@ -78,7 +85,7 @@ const config = {
           concept = two;
           value = one;
         }
-        let instance = await e(value)
+        let instance = await e(value, where())
         if (instance.verbatim) {
           context.evalue = { verbatim: instance.verbatim }
           context.isResponse = true
@@ -108,11 +115,11 @@ const config = {
       // types of job           what are the types of animals -> next one
       notes: 'type of pikachu',  // the types of type is the next one
       where: where(),
-      match: ({context}) => context.marker == 'type' && context.evaluate && context.objects[context.objects.length-1].number == 'one' && pluralize.isSingular(context.objects[0].word),
+      match: ({context}) => context.marker == 'type' && context.objects[context.objects.length-1].number == 'one' && pluralize.isSingular(context.objects[0].word),
       apply: async ({context, hierarchy, objects, e, gs, km, log}) => {
         const concept = context.objects[0];
         const value = context.objects[1];
-        let instance = await e(value)
+        let instance = await e(value, where())
         if (instance.verbatim) {
           context.evalue = { verbatim: instance.verbatim }
           return
@@ -168,16 +175,27 @@ const config = {
     {
       notes: 'c is a y',
       where: where(),
-      match: ({context, listable}) => listable(context.marker, 'hierarchyAble') && !context.pullFromContext && !context.wantsValue && context.same && !context.same.pullFromContext && context.same.wantsValue,
+      match: ({context, listable}) => {
+        if (context.marker !== 'same') {
+          return
+        }
+        const { one, two } = context
+        return listable(one.marker, 'hierarchyAble') && 
+          !one.pullFromContext && 
+          !one.wantsValue && 
+          !two.pullFromContext && 
+          two.wantsValue
+      },
       apply: async ({context, km, objects, asList, baseConfig : config}) => {
         const api = km('properties').api
         // mark c as an instance?
-        const oneConcepts = asList(context);
-        const twoConcepts = asList(context.same);
+        const { one, two } = context
+        const oneConcepts = asList(one);
+        const twoConcepts = asList(two);
         for (let oneConcept of oneConcepts.value) {
           for (let twoConcept of twoConcepts.value) {
-            oneConcept = await api.makeObject({config, context})
-            twoConcept = await api.makeObject({config, context: context.same})
+            oneConcept = await api.makeObject({config, context: one})
+            twoConcept = await api.makeObject({config, context: two})
             api.rememberIsA(oneConcept, twoConcept)
           }
         }
@@ -187,15 +205,22 @@ const config = {
     {
       notes: 'an x is a y',
       where: where(),
-      match: ({context, listable}) => listable(context.marker, 'hierarchyAble') && !context.pullFromContext && context.wantsValue && context.same,
+      match: ({context, listable}) => {
+        if (context.marker !== 'same') {
+          return
+        }
+        const { one, two } = context
+        return listable(one.marker, 'hierarchyAble') && !one.pullFromContext && one.wantsValue
+      },
       apply: async ({context, km, objects, baseConfig : config, asList}) => {
         const api = km('properties').api
-        const oneConcepts = asList(context);
-        const twoConcepts = asList(context.same);
+        const { one, two } = context
+        const oneConcepts = asList(one);
+        const twoConcepts = asList(two);
         for (let oneConcept of oneConcepts.value) {
           for (let twoConcept of twoConcepts.value) {
-            oneConcept = await api.makeObject({config, context})
-            twoConcept = await api.makeObject({config, context: context.same})
+            oneConcept = await api.makeObject({config, context: one})
+            twoConcept = await api.makeObject({config, context: two})
             api.rememberIsA(oneConcept, twoConcept) 
             context.sameWasProcessed = true
           }
@@ -206,52 +231,54 @@ const config = {
       notes: 'humans are mammels',
       where: where(),
       match: ({debug, context, listable, hierarchy, isA, callId}) => {
-        // debug.b2reakAt('dates#call4')
-        if (!context.same) {
+        if (context.marker !== 'same') {
+          return
+        }
+        const { one, two } = context
+        if (one.query || two.query) {
           return
         }
 
         // let the "the metric system is a measurement system" threw but block 'the gender is male'
-        if (context.theable && !context.same.determiner && !context.same.pullFromContext) {
+        if (one.theable && !two.determiner && !two.pullFromContext) {
           return
         }
-        if (context.same.determiner && context.same.determiner.marker == 'a') {
-          context.same.concept = true;
-        } else if (context.same.evaluate) {
-          return // some kind of instance
-        } else if (context.same.word && pluralize.isPlural(context.same.word)) {
-          context.same.concept = true;
-        } else if (context.number == 'many') {
-          context.same.concept = true;
-        //} else if (!context.same.determiner && pluralize.isSingular(context.same.word) && !context.same.instance) {
-        //  context.same.concept = true;
-        // } else if (false && isA(context.same.marker, 'hierarchyAble') && context.same.word && pluralize.isSingular(context.same.word) && !context.same.instance) {
-        } else if (context.same.marker !== 'unknown' && isA(context.same.marker, 'hierarchyAble') && !context.same.pullFromContext && context.same.word && pluralize.isSingular(context.same.word) && !context.same.instance) {
-          context.same.concept = true;
+        if (two.determiner && two.determiner.marker == 'a') {
+          two.concept = true;
+        } else if (two.word && pluralize.isPlural(two.word)) {
+          two.concept = true;
+        } else if (one.number == 'many') {
+          two.concept = true;
+        //} else if (!two.determiner && pluralize.isSingular(two.word) && !two.isInstance) {
+        //  two.concept = true;
+        // } else if (false && isA(two.marker, 'hierarchyAble') && two.word && pluralize.isSingular(two.word) && !two.isInstance) {
+        } else if (two.marker !== 'unknown' && isA(two.marker, 'hierarchyAble') && !two.pullFromContext && two.word && pluralize.isSingular(two.word) && !two.isInstance) {
+          two.concept = true;
         } else {
           return
         }
 
-        if ((hierarchy.isA(context.marker, 'property') && context.same && context.objects)|| ((context.same||{}).marker === 'readonly')) {
+        if ((hierarchy.isA(one.marker, 'property') && two && one.objects)|| ((two||{}).marker === 'readonly')) {
           return;
         }
 
-        if (context.same && context.same.word && pluralize.isPlural(context.same.word)) {
-          context.same.concept = true;
+        if (two && two.word && pluralize.isPlural(two.word)) {
+          two.concept = true;
         }
        
         // getting 20 and allowing it to be a class name  like "priority is a 20"
-        if (false && context.same && context.same.word && pluralize.isSingular(context.same.word)) {
-          context.same.concept = true;
+        if (false && two && two.word && pluralize.isSingular(two.word)) {
+          two.concept = true;
         }
        
-        return listable(context, 'hierarchyAble') && context.same && context.same.concept && !context.query
+        return listable(one, 'hierarchyAble') && two && two.concept && !one.query
       },
       apply: async (args) => {
         const {callId, addWordToDictionary, config, objects, km, context, asList, listable} = args
+        const { one, two } = context
         const api = km('properties').api
-        const oneConcepts = asList(context);
-        const twoConcepts = asList(context.same);
+        const oneConcepts = asList(one);
+        const twoConcepts = asList(two);
         for (const oneConcept of oneConcepts.value) {
           for (const twoConcept of twoConcepts.value) {
             addWordToDictionary({ ...oneConcept, same: undefined })
@@ -271,7 +298,7 @@ const config = {
       // types of job
       notes: 'types of type', // what are the types of animals
       where: where(),
-      match: ({context}) => context.marker == 'type' && context.evaluate && context.objects,
+      match: ({context}) => context.marker == 'type' && context.objects,
       apply: ({context, objects, km, isA}) => {
         const api = km('properties').api
         const conceptApi = km('concept').api
@@ -316,7 +343,10 @@ knowledgeModule( {
     contents: hierarchy_tests,
     // TODO doesnt this need the KM
     checks: {
-      objects: ['children', 'concept', 'parents', 'properties'],
+      objects: [
+        'children', 'concept', 'parents', 'properties',
+        { km: 'properties' },
+      ],
       context: [
         defaultContextCheck(),
       ],

package/common/kirk.instance.json

@@ -106,7 +106,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "kirk#call2"
           ]
@@ -232,6 +231,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "you are kirk",
       "key": {
         "query": "you are kirk"

package/common/latin.instance.json

@@ -131,12 +131,12 @@
             "match": "same",
             "left": [
               {
-                "pattern": "($type && context.instance == variables.instance)"
+                "pattern": "($type && context.isInstance == variables.isInstance)"
               }
             ],
             "right": [
               {
-                "pattern": "($type && context.instance == variables.instance)"
+                "pattern": "($type && context.isInstance == variables.isInstance)"
               }
             ],
             "passthrough": true
@@ -150,7 +150,7 @@
             "match": "same",
             "left": [
               {
-                "pattern": "($type && context.instance == variables.instance)"
+                "pattern": "($type && context.isInstance == variables.isInstance)"
               }
             ],
             "passthrough": true
@@ -159,7 +159,7 @@
         },
         {
           "id": "queryMarker",
-          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], question: true }",
+          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, { separator: '' }, { context: operator }], question: true }",
           "separators": "|",
           "before": [
             "hierarchy"
@@ -173,7 +173,7 @@
               "listable"
             ]
           ],
-          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], isList: true }",
+          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, { separator: '' }, { context: operator }], isList: true }",
           "separators": "|"
         },
         {
@@ -366,12 +366,12 @@
             "match": "same",
             "left": [
               {
-                "pattern": "($type && context.instance == variables.instance)"
+                "pattern": "($type && context.isInstance == variables.isInstance)"
               }
             ],
             "right": [
               {
-                "pattern": "($type && context.instance == variables.instance)"
+                "pattern": "($type && context.isInstance == variables.isInstance)"
               }
             ],
             "passthrough": true
@@ -385,7 +385,7 @@
             "match": "same",
             "left": [
               {
-                "pattern": "($type && context.instance == variables.instance)"
+                "pattern": "($type && context.isInstance == variables.isInstance)"
               }
             ],
             "passthrough": true
@@ -394,7 +394,7 @@
         },
         {
           "id": "queryMarker",
-          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], question: true }",
+          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, { separator: '' }, { context: operator }], question: true }",
           "separators": "|",
           "before": [
             "hierarchy"
@@ -408,7 +408,7 @@
               "listable"
             ]
           ],
-          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], isList: true }",
+          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, { separator: '' }, { context: operator }], isList: true }",
           "separators": "|"
         },
         {

package/common/latin.js

@@ -86,8 +86,8 @@ const config = {
       level: 0,
       selector: {
           match: "same",
-          left: [ { pattern: '($type && context.instance == variables.instance)' } ],
-          right: [ { pattern: '($type && context.instance == variables.instance)' } ],
+          left: [ { pattern: '($type && context.isInstance == variables.isInstance)' } ],
+          right: [ { pattern: '($type && context.isInstance == variables.isInstance)' } ],
           passthrough: true
       },
       bridge: "{ ...next(operator), listable: true, isList: true, value: append(before, after), operator: operator, interpolate: [ { separator: 'operator', values: 'value' } ] }"
@@ -97,7 +97,7 @@ const config = {
       level: 1,
       selector: {
           match: "same",
-          left: [ { pattern: '($type && context.instance == variables.instance)' } ],
+          left: [ { pattern: '($type && context.isInstance == variables.isInstance)' } ],
           passthrough: true
       },
       bridge: "{ ...operator, value: append(before, operator.value) }"
@@ -105,14 +105,14 @@ const config = {
 
     { 
       id: "queryMarker",
-      bridge: "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], question: true }",
+      bridge: "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, { separator: '' }, { context: operator }], question: true }",
       separators: '|',
       before: ['hierarchy'],
     },
     { 
       id: "listMarker",
       localHierarchy: [['unknown', 'listable']],
-      bridge: "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], isList: true }",
+      bridge: "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, { separator: '' }, { context: operator }], isList: true }",
       separators: '|',
     },
     { id: "hierarchiable" },