tpmkms_4wp 9.5.1-beta.9 → 9.6.0-beta.0

package/common/helpers.js

@@ -188,6 +188,7 @@ function defaultObjectCheck(extra = []) {
   return {
     objects: [
       {
+        extra,
         match: ({objects}) => true,
         apply: () => extra
       },
@@ -204,9 +205,9 @@ function defaultContextCheck({marker, extra = [], exported = false} = {}) {
   if (marker) {
     match = ({context}) => context.marker == marker
   } else {
-    match = ({context}) => !Array.isArray(context)
   }
   return {
+    marker,
     match,
     exported,
     apply: () => ['marker', 'text', 'verbatim', 'value', 'evalue', 'isResponse', { properties: 'modifiers' }, { properties: 'postModifiers' }, ...extra],
@@ -247,7 +248,10 @@ function getValue(propertyPath, object) {
   if (!propertyPath) {
     return
   }
-  const path = propertyPath.split('.')
+  let path = propertyPath
+  if (typeof path == 'string') {
+    path = propertyPath.split('.')
+  }
   let value = object
   for (const name of path) {
     if (!value) {
@@ -258,6 +262,29 @@ function getValue(propertyPath, object) {
   return value
 }
 
+function setValue(propertyPath, object, newValue) {
+  if (!propertyPath) {
+    return;
+  }
+  let path = propertyPath;
+  if (typeof path === 'string') {
+    path = propertyPath.split('.');
+  }
+  let current = object;
+  for (let i = 0; i < path.length; i++) {
+    const name = path[i];
+    if (i === path.length - 1) {
+      // Set the value at the final step
+      current[name] = newValue;
+      break;
+    }
+    if (current[name] === undefined || current[name] === null) {
+      current[name] = {};  // Create a plain object for nesting
+    }
+    current = current[name];
+  }
+}
+
 async function processTemplateString(template, evaluate) {
   async function resolveWithCallback(strings, ...keys) {
     // const resolvedValues = await Promise.all(keys.map(key => lookupVariable(key)));
@@ -354,7 +381,10 @@ module.exports = {
   processTemplateString,
   unshiftL,
   pushL,
+
   getValue,
+  setValue,
+
   defaultContextCheck,
   defaultContextCheckProperties,
   defaultObjectCheck,

package/common/hierarchy.js

@@ -1,4 +1,4 @@
-const { knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { debug, knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const properties = require('./properties')
 const hierarchy_tests = require('./hierarchy.test.json')
@@ -6,14 +6,14 @@ const pluralize = require('pluralize')
 const _ = require('lodash')
 const { isMany } = require('./helpers')
 
-function getTypes( km, concept, instance ) {
-  const propertiesAPI = km('properties').api;
+function getTypes( km, digraph, concept, instance ) {
+  // const propertiesAPI = km('properties').api;
   const conceptAPI = km('concept').api;
-  const digraph = propertiesAPI.digraph;
+  // const digraph = propertiesAPI.digraph;
   function intersect(set1, set2) {
     return new Set([...set1].filter(x => set2.has(x)))
   }
-  const descendants = digraph.descendants(concept.value)
+  const descendants = digraph.descendants(concept.value || concept.marker)
   const ancestors = digraph.ancestors(instance.evalue)
   const common = intersect(ancestors, descendants)
   const answer = Array.from(digraph.minima(common))
@@ -79,7 +79,7 @@ const config = {
           context.isResponse = true
           return
         }
-        instance = getTypes(km, concept, instance)
+        instance = getTypes(km, hierarchy, concept, instance)
 
         concept = _.cloneDeep(value)
         concept.isQuery = undefined
@@ -104,7 +104,7 @@ const config = {
       notes: 'type of pikachu',  // the types of type is the next one
       where: where(),
       match: ({context}) => context.marker == 'type' && context.evaluate && context.object && context.objects[context.objects.length-1].number == 'one' && pluralize.isSingular(context.objects[0].word),
-      apply: async ({context, objects, e, gs, km, log}) => {
+      apply: async ({context, hierarchy, objects, e, gs, km, log}) => {
         const concept = context.objects[0];
         const value = context.objects[1];
         let instance = await e(value)
@@ -112,7 +112,7 @@ const config = {
           context.evalue = { verbatim: instance.verbatim }
           return
         }
-        instance = getTypes(km, concept, instance)
+        instance = getTypes(km, hierarchy, concept, instance)
         context.evalue = instance
         if (context.evalue.value.length > 1) {
           context.number = 'many'
@@ -253,9 +253,11 @@ const config = {
         const twoConcepts = asList(context.same);
         for (const oneConcept of oneConcepts.value) {
           for (const twoConcept of twoConcepts.value) {
+            // debug.counter('greg23', { breakAt: 39 })
             oneConceptId = await api.makeObject({...args, context: oneConcept})
             twoConceptId = await api.makeObject({...args, context: twoConcept})
             api.rememberIsA(oneConceptId, twoConceptId)
+            api.seenHierarchyWatcher({ childId: oneConceptId, child: oneConcept, parentId: twoConceptId, parent: twoConcept })
             context.sameWasProcessed = true
           }
         }

package/common/kirk.instance.json

@@ -1405,6 +1405,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",

package/common/kirk.js

@@ -2,7 +2,7 @@ const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const crew = require('./crew')
 const kirk_tests = require('./kirk.test.json')
-const kirk_instance = require('./kirk.instance.json')
+const instance = require('./kirk.instance.json')
 
 const template = {
   configs: [
@@ -14,7 +14,7 @@ const template = {
 // TODO what is the name of you
 // TODO crew members -> who are the crew members
 
-kirk_instance.base = 'crew'
+instance.base = 'crew'
 
 // config.load(template, kirk_instance)
 knowledgeModule( {
@@ -30,8 +30,6 @@ knowledgeModule( {
             context: [defaultContextCheck()],
           }
         },
-  template: {
-    template,
-    instance: kirk_instance,
-  },
+  instance,
+  template,
 })