entodicton 9.6.1 → 9.6.2

package/client.js

@@ -12,7 +12,7 @@ const _ = require('lodash')
 const stringify = require('json-stable-stringify')
 const Lines = require('./lines')
 const flattens = require('./src/flatten')
-const { sortJson, appendNoDups, updateQueries, safeNoDups, stableId, where, suggestAssociationsFix, suggestAssociationsFixFromSummaries, validProps } = require('./src/helpers')
+const { sortJson, appendNoDups, InitCalls, updateQueries, safeNoDups, stableId, where, suggestAssociationsFix, suggestAssociationsFixFromSummaries, validProps } = require('./src/helpers')
 const runtime = require('./runtime')
 const db = require('./src/debug')
 
@@ -319,6 +319,13 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
 
     let startCounter = 0
     let contextIdCounter = 0
+    let calls
+    if (global.theprogrammablemind && global.theprogrammablemind.loadForTesting) {
+      calls = new InitCalls(Object.keys(global.theprogrammablemind.loadForTesting)[0])
+    } else {
+      calls = new InitCalls(config.getName())
+    }
+
     while (true) {
       if (queries.length === 0) {
         break
@@ -330,7 +337,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
       let resetData = false
       if (json.code === 'NOT_IN_CACHE') {
         resetData = true
-        const setupB = setupProcessB({ config, allowDelta: false })
+        const setupB = setupProcessB({ config, calls, allowDelta: false })
         data = setupB.data
         hierarchy = setupB.hierarchy
         data.utterance = queries[0]
@@ -360,7 +367,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
         const summary = { summaries: json.summaries, length: json.contexts.length }
         summaries.push(summary)
         const { updatedContextIdCounter, contextsPrime, generatedPrime, paraphrasesPrime, paraphrasesParenthesizedPrime, generatedParenthesizedPrime, responsesPrime } =
-                                  await processContextsB({ contextIdCounter, isTest, isProcess, isModule, rebuildingTemplate, config, hierarchy, json, commandLineArgs /*, generators, semantics */ })
+                                  await processContextsB({ contextIdCounter, calls, isTest, isProcess, isModule, rebuildingTemplate, config, hierarchy, json, commandLineArgs /*, generators, semantics */ })
         contextIdCounter = updatedContextIdCounter
         if (isTest) {
           const end = runtime.performance.performance.now()
@@ -657,11 +664,11 @@ const saveTestsHelper = async (testFile, config, tests, todo, testConfig, saveDe
     return
   }
   const test = todo.pop()
-  await config.rebuild()
+  // await config.rebuild()
   const result = await saveTest(testFile, config, test, tests[test], testConfig, saveDeveloper)
   // initialize in between test so state is not preserved since the test was adding without state
   // config.initialize({force: true})
-  await config.rebuild()
+  // await config.rebuild()
   return saveTestsHelper(testFile, config, tests, todo, testConfig, saveDeveloper)
 }
 
@@ -755,7 +762,7 @@ const defaultErrorHandler = async (error) => {
     console.log('trace: ', error.trace)
   }
 
-  if (error.config) {
+  if (false && error.config) {
     console.log('objects', runtime.util.inspect(error.config.get('objects'), { depth: Infinity, sorted: true }))
   }
 

package/package.json

@@ -73,6 +73,6 @@
     "scriptjs": "^2.5.9",
     "uuid": "^8.3.2"
   },
-  "version": "9.6.1",
+  "version": "9.6.2",
   "license": "UNLICENSED"
 }

package/src/configHelpers.js

@@ -99,10 +99,18 @@ class ContextHierarchy {
     this.contexts.pop()
   }
 
-  under(marker) {
-    for (let i = this.contexts.length - 1; i >= 0; --i) {
-      if (this.contexts[i].marker == marker) {
-        return true
+  under(markers) {
+    if (!markers || markers.length == 0) {
+      return this.contexts.length == 0
+    }
+    if (!Array.isArray(markers)) {
+      markers = [markers]
+    }
+    for (const marker of markers) {
+      for (let i = this.contexts.length - 1; i >= 0; --i) {
+        if (this.contexts[i].marker == marker) {
+          return true
+        }
       }
     }
   }
@@ -123,9 +131,12 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
     hierarchy = config.getHierarchy()
   }
   // callId
-  args.calls = new InitCalls(args.isInstance ? `${args.isInstance}#${config.getName()}` : config.getName())
-  if (global.theprogrammablemind && global.theprogrammablemind.loadForTesting) {
-    args.calls = new InitCalls(Object.keys(global.theprogrammablemind.loadForTesting)[0])
+  // debug.counter('InitCalls', { breakAt: 641 })
+  if (!args.calls) {
+    args.calls = new InitCalls(args.isInstance ? `${args.isInstance}#${config.getName()}` : config.getName())
+    if (global.theprogrammablemind && global.theprogrammablemind.loadForTesting) {
+      args.calls = new InitCalls(Object.keys(global.theprogrammablemind.loadForTesting)[0])
+    }
   }
   args.contextHierarchy = new ContextHierarchy()
   args.cleanAssign = cleanAssign
@@ -356,7 +367,7 @@ const setupContexts = (rawContexts) => {
   return contexts
 }
 
-const processContextsB = async ({ config, hierarchy, semantics, generators, json, isTest, isProcess, isModule, rebuildingTemplate, isInstance, instance, query, data, retries, url, commandLineArgs, forTemplate, contextIdCounter }) => {
+const processContextsB = async ({ config, calls, hierarchy, semantics, generators, json, isTest, isProcess, isModule, rebuildingTemplate, isInstance, instance, query, data, retries, url, commandLineArgs, forTemplate, contextIdCounter }) => {
   // TODO fix this name to contextsPrime
   const contextsPrime = []
   const generatedPrime = []
@@ -367,7 +378,7 @@ const processContextsB = async ({ config, hierarchy, semantics, generators, json
   const contexts = setupContexts(json.contexts)
 
   const objects = config.get('objects')
-  const args = { objects, isResponse: true, response: json, isTest, isInstance, getObjects: getObjects(objects), instance, contexts, isProcess, isModule }
+  const args = { objects, isResponse: true, response: json, isTest, isInstance, getObjects: getObjects(objects), instance, contexts, isProcess, isModule, calls }
   if (!json.logs) {
     json.logs = []
   }
@@ -578,5 +589,6 @@ module.exports = {
   gs,
   processContextsB,
   loadInstance,
-  isA
+  isA,
+  ContextHierarchy,
 }

package/src/project2.js

@@ -1,3 +1,5 @@
+const debug = require('./debug')
+
 function areFirstNEqual(arr1, arr2, n) {
   if (n <= 0) return true;
   if (arr1.length < n || arr2.length < n) return false;
@@ -89,7 +91,15 @@ function project(source, filters, path=[]) {
       if (typeof source[prop.property] === 'object' && source[prop.property] !== null) {
         result[prop.property] = {}
         for (const key of prop.check) {
-          result[prop.property][key] = project(source[prop.property][key], filters, [...path, prop.property, key]);
+          if (typeof key == 'string') {
+            result[prop.property][key] = project(source[prop.property][key], filters, [...path, prop.property, key]);
+          } else {
+            const f = {
+              match: () => true,
+              apply: () => key.check
+            }
+            result[prop.property][key.property] = project(source[prop.property][key.property], [f], [...path, prop.property, key.property]);
+          }
         }
       } else {
         // Copy primitive or null properties directly