theprogrammablemind 8.9.0-beta.18 → 8.9.0-beta.2

package/client.js

@@ -1654,13 +1654,11 @@ 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-beta.18",
+  "version": "8.9.0-beta.2",
   "license": "UNLICENSED"
 }

package/src/configHelpers.js

@@ -29,20 +29,23 @@ const gs = (g) => async (contexts, separator, lastSeparator) => {
   return s
 }
 
-const isA = (hierarchy) => (child, parent, { strict=false } = {}) => {
+const asList = (context) => {
+  if (context.marker === 'list') {
+    return context
+  }
+  return {
+    marker: 'list',
+    types: [context.marker],
+    value: [context]
+  }
+}
+
+const isA = (hierarchy) => (child, parent, { extended=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 (extended) {
     if (hierarchy.isA(child.marker || child, parent.marker || parent)) {
       return true
     }
@@ -54,6 +57,14 @@ const isA = (hierarchy) => (child, parent, { strict=false } = {}) => {
       }
     }
     return false
+  } else {
+    if (child.marker) {
+      child = child.marker
+    }
+    if (parent.marker) {
+      parent = parent.marker
+    }
+    return hierarchy.isA(child, parent)
   }
 }
 
@@ -64,6 +75,23 @@ 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
@@ -97,8 +125,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)
@@ -433,12 +461,11 @@ const loadInstance = async (config, instance) => {
 module.exports = {
   setupProcessB,
   ErrorReason,
-  // listable,
+  listable,
   setupArgs,
   processContext,
   getObjects,
   gs,
   processContextsB,
   loadInstance,
-  isA,
 }

package/src/digraph.js

@@ -118,12 +118,8 @@ class Digraph {
     return this.acdcs(s, 1, 0)
   }
 
-  ancestors (s, { includeSelf } = {}) {
-    const ancestors = this.acdcs(s, 0, 1)
-    if (includeSelf) {
-      ancestors.add(s)
-    }
-    return ancestors
+  ancestors (s) {
+    return this.acdcs(s, 0, 1)
   }
 
   minima (nodes) {
@@ -151,24 +147,6 @@ 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,13 +86,8 @@ class DigraphInternal {
     return this.acdcs(s, 1, 0)
   }
 
-  ancestors (s, { includeSelf } = {}) {
-    const ancestors = this.acdcs(s, 0, 1)
-    if (includeSelf) {
-      ancestors.add(s)
-    }
-    return ancestors
-
+  ancestors (s) {
+    return this.acdcs(s, 0, 1)
   }
 
   minima (nodes) {
@@ -120,23 +115,6 @@ 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)