theprogrammablemind 7.5.8-beta.71 → 7.5.8-beta.73

package/client.js

@@ -1157,10 +1157,16 @@ const defaultInnerProcess = (config, errorHandler, responses) => {
   }
   const picked = pickEm()
   if (!_.isEmpty(picked)) {
-    console.log('--- checked object properties ---')
+    console.log('--- Object showing only the checked values ---')
     console.log(JSON.stringify(picked, null, 2))
   }
 
+  const pickedResultContexts = responses.contexts.map(pickContext(config.testConfig))
+  if (pickedResultContexts.some( (context) => Object.keys(context).length > 0 )) {
+    console.log('--- Contexts showing only the checked values ---')
+    console.log(JSON.stringify(pickedResultContexts, null, 2))
+  }
+
   console.log('--- The contexts are ----------')
   console.log(JSON.stringify(sortJson(responses.contexts, { depth: 25 }), null, 2))
   console.log('')

package/package.json

@@ -64,6 +64,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.8-beta.71",
+  "version": "7.5.8-beta.73",
   "license": "ISC"
 }

package/src/helpers.js

@@ -172,9 +172,6 @@ const isCompound = (value) => {
   return isArray(value) || isObject(value)
 }
 
-nextCallId = 0
-nextContextId = 0
-
 class InitCalls {
 
   constructor(name) {
@@ -198,9 +195,10 @@ class InitCalls {
     // this.nextCallId += 1
     // this.stack.push(this.nextCallId)
     this.stack.push(this.nextCallId)
+    // TODO put the nextContextId in the context for debugging
     const calls = this.stack.map( (call) => `${this.name}#call${call}` )
     // return `Context#${this.nextContextId}: ${calls}`
-    return `Context#${nextContextId}: ${calls}`
+    return `Context#${this.nextContextId}: ${calls}`
   }
 
   current() {

package/src/project.js

@@ -11,13 +11,30 @@ const project = (object, filter) => {
     } else {
       for (let properties of filter) {
         if (typeof properties == 'object') {
-          debugger
-          const subfilterProperty = Object.keys(properties)[0]
-          oldValue = object[subfilterProperty]
-          if (Array.isArray(oldValue)) {
-            projection[subfilterProperty] = oldValue.map((v) => project(v, properties[subfilterProperty]))
-          } else {
-            projection[subfilterProperty] = project(oldValue, properties[subfilterProperty])
+          if (properties.propertyLists) {
+            for (const propertyList in properties.propertyLists) {
+              if (object[propertyList]) {
+                for (const property of object[propertyList]) {
+                  projection[property] = project(object[property], properties.propertyLists[propertyList])
+                }
+              }
+            }
+          } 
+          if (properties.valueLists) {
+            for (const listProperty in properties.valueLists) {
+              const old = object[listProperty]
+              if (Array.isArray(old)) {
+                projection[listProperty] = old.map((element) => project(element, properties.valueLists[listProperty]))
+              } else {
+                projection[listProperty] = project(old, properties.valueLists[listProperty])
+              }
+            }
+          }
+          if (properties.properties) {
+            for (const property in properties.properties) {
+              const old = object[property]
+              projection[property] = project(old, properties.properties[property])
+            }
           }
         } else {
           if (!Array.isArray(properties)) {