theprogrammablemind 8.9.0 → 8.9.1-beta.1

package/client.js

@@ -1654,11 +1654,13 @@ const knowledgeModuleImpl = async ({
                     }
                   }
                 } else {
+                  /*
                   if (results.length > 0 && args.vimdiff) {
                     for (const result of results) {
                       vimdiff(result.actual, result.expected)
                     }
                   }
+                  */
                 }
                 if (hasError) {
                   if (!headerShown) {

package/package.json

@@ -65,6 +65,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "8.9.0",
+  "version": "8.9.1-beta.1",
   "license": "UNLICENSED"
 }

package/src/configHelpers.js

@@ -29,23 +29,20 @@ const gs = (g) => async (contexts, separator, lastSeparator) => {
   return s
 }
 
-const asList = (context) => {
-  if (context.marker === 'list') {
-    return context
-  }
-  return {
-    marker: 'list',
-    types: [context.marker],
-    value: [context]
-  }
-}
-
-const isA = (hierarchy) => (child, parent, { extended=false } = {}) => {
+const isA = (hierarchy) => (child, parent, { strict=false } = {}) => {
   if (!child || !parent) {
     return false
   }
 
-  if (extended) {
+  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
     }
@@ -57,14 +54,6 @@ const isA = (hierarchy) => (child, parent, { extended=false } = {}) => {
       }
     }
     return false
-  } else {
-    if (child.marker) {
-      child = child.marker
-    }
-    if (parent.marker) {
-      parent = parent.marker
-    }
-    return hierarchy.isA(child, parent)
   }
 }
 
@@ -75,23 +64,6 @@ class ErrorReason extends Error {
   }
 }
 
-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 cleanAssign = (dest, ...srcs) => {
   for (const key in dest) {
     let found = false
@@ -125,8 +97,8 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   args.config = config
   args.hierarchy = hierarchy
   args.isA = isA(hierarchy)
-  args.listable = listable(hierarchy)
-  args.asList = asList
+  // args.listable = listable(hierarchy)
+  // args.asList = asList
   args.retry = () => { throw new RetryError() }
   args.fragments = (query) => {
     return config.fragment(args, query)
@@ -461,11 +433,12 @@ const loadInstance = async (config, instance) => {
 module.exports = {
   setupProcessB,
   ErrorReason,
-  listable,
+  // listable,
   setupArgs,
   processContext,
   getObjects,
   gs,
   processContextsB,
   loadInstance,
+  isA,
 }

package/src/digraph.js

@@ -118,8 +118,12 @@ class Digraph {
     return this.acdcs(s, 1, 0)
   }
 
-  ancestors (s) {
-    return this.acdcs(s, 0, 1)
+  ancestors (s, { includeSelf } = {}) {
+    const ancestors = this.acdcs(s, 0, 1)
+    if (includeSelf) {
+      ancestors.add(s)
+    }
+    return ancestors
   }
 
   minima (nodes) {
@@ -147,6 +151,24 @@ class Digraph {
     return minima
   }
 
+  lub (nodes) {
+    if (nodes.length === 0) {
+      return new Set([])
+    }
+    debugger
+    nodes = Array.from(nodes);
+    let common = this.ancestors(nodes[0], { includeSelf: true })
+
+    for (let i = 1; i < nodes.length; i++) {
+      const ancestors = this.ancestors(nodes[i], { includeSelf: true })
+      common = new Set([...common].filter(x => ancestors.has(x)))
+      if (common.size === 0) {
+        break;
+      }
+    }
+    return this.minima(common);
+  }
+
   /*
   maxima (nodes) {
     const maxima = new Set(nodes)

package/src/digraph_internal.js

@@ -86,8 +86,13 @@ class DigraphInternal {
     return this.acdcs(s, 1, 0)
   }
 
-  ancestors (s) {
-    return this.acdcs(s, 0, 1)
+  ancestors (s, { includeSelf } = {}) {
+    const ancestors = this.acdcs(s, 0, 1)
+    if (includeSelf) {
+      ancestors.add(s)
+    }
+    return ancestors
+
   }
 
   minima (nodes) {
@@ -115,6 +120,23 @@ class DigraphInternal {
     return minima
   }
 
+  lub (nodes) {
+    if (nodes.length === 0) {
+      return new Set([])
+    }
+    nodes = Array.from(nodes);
+    let common = this.ancestors(nodes[0], { includeSelf: true })
+
+    for (let i = 1; i < nodes.length; i++) {
+      const ancestors = this.ancestors(nodes[i], { includeSelf: true })
+      common = new Set([...common].filter(x => ancestors.has(x)))
+      if (common.size === 0) {
+        break;
+      }
+    }
+    return this.minima(common);
+  }
+
   /*
   maxima (nodes) {
     const maxima = new Set(nodes)