theprogrammablemind 8.0.0-beta.6 → 8.0.0-beta.60

package/client.js

@@ -1,5 +1,7 @@
 const { Semantics, Semantic } = require('./src/semantics')
 const { Generators, Generator } = require('./src/generators')
+const { Config } = require('./src/config')
+const { loadInstance, ErrorReason, listable, setupArgs, gs, processContext, getObjects, setupProcessB, processContextsB  } = require('./src/configHelpers')
 const DigraphInternal = require('./src/digraph_internal')
 const Digraph = require('./src/digraph')
 const { project } = require('./src/project')
@@ -10,36 +12,10 @@ const _ = require('lodash')
 const stringify = require('json-stable-stringify')
 const Lines = require('./lines')
 const flattens = require('./src/flatten')
-const { appendNoDups, InitCalls, updateQueries, safeNoDups, stableId } = require('./src/helpers')
+const { appendNoDups, InitCalls, updateQueries, safeNoDups, stableId, where } = require('./src/helpers')
 const runtime = require('./runtime')
 const sortJson = runtime.sortJson
 
-function where (goUp = 2) {
-  const e = new Error()
-  const regexForm1 = /\((.*):(\d+):(\d+)\)$/
-  const regexForm2 = /at (.*):(\d+):(\d+)$/
-  const lines = e.stack.split('\n')
-  let line
-  let match
-  for (line of lines.slice(1)) {
-    // if (!(line.includes('config.js:') || line.includes('client.js:') || line.includes('<anonymous>'))) {
-    if (!(line.includes('config.js:') || line.includes('client.js:'))) {
-      match = regexForm1.exec(line) || regexForm2.exec(line)
-      if (!match) {
-        continue
-      }
-      break
-    }
-  }
-  // const line = e.stack.split("\n")[goUp];
-  // const match = regexForm1.exec(line) || regexForm2.exec(line)
-  if (match) {
-    return `${match[1]}:${match[2]}`
-  } else {
-    return 'running in browser'
-  }
-}
-
 const getConfig_getObjectsCheck = (config, testConfig) => {
   let testConfigName = config.name
   if (testConfig.testModuleName) {
@@ -108,164 +84,6 @@ const vimdiff = (actualJSON, expectedJSON, title) => {
   }
 }
 
-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 isA = (hierarchy) => (child, parent) => {
-  if (!child || !parent) {
-    return false
-  }
-  if (child.marker) {
-    child = child.marker
-  }
-  if (parent.marker) {
-    parent = parent.marker
-  }
-  return hierarchy.isA(child, parent)
-}
-
-const asList = (context) => {
-  if (context.marker === 'list') {
-    return context
-  }
-  return {
-    marker: 'list',
-    types: [context.marker],
-    value: [context]
-  }
-}
-
-class ErrorReason extends Error {
-  constructor (context) {
-    super(JSON.stringify(context))
-    this.reason = context
-  }
-}
-
-const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
-
-  // callId
-  args.calls = new InitCalls(args.isInstance ? `${args.isInstance}#${config.name}` : config.name)
-  if (global.theprogrammablemind && global.theprogrammablemind.loadForTesting) {
-    args.calls = new InitCalls(Object.keys(global.theprogrammablemind.loadForTesting)[0])
-  }
-  args.km = (name) => config.getConfig(name)
-  args.api = (name) => config.getConfig(name).api
-  args.error = (context) => {
-    throw new ErrorReason(context)
-  }
-  args.kms = config.getConfigs()
-  args.config = config
-  args.hierarchy = hierarchy
-  args.isA = isA(hierarchy)
-  args.listable = listable(hierarchy)
-  args.asList = asList
-  args.retry = () => { throw new RetryError() }
-  args.fragments = (query) => config.fragment(query)
-  args.breakOnSemantics = false
-  args.theDebugger = {
-    breakOnSemantics: (value) => args.breakOnSemantics = value
-  }
-  if (!logs) {
-  }
-  args.log = (message) => logs.push(message)
-
-  args.addAssumedScoped = (args, assumed) => {
-    const addAssumed = (args, ...moreAssumed) => {
-      return { ...args, assumed: Object.assign({}, assumed, (args.assumed || {}), ...moreAssumed) }
-    }
-
-    args.s = (c) => config.getSemantics(logs).apply(args, c)
-    args.g = (c, a = {}) => {
-      return config.getGenerators(logs).apply(addAssumed(args, a), c, a)
-    }
-    args.gp = (c, a = {}) => {
-      return config.getGenerators(logs).apply(addAssumed(args, a, { paraphrase: true, isResponse: false, response: false }), c, { paraphrase: true, isResponse: false, response: false })
-    }
-    args.gr = (c, a = {}) => {
-      return config.getGenerators(logs).apply(addAssumed(args, a, { paraphrase: false, isResponse: true }), { ...c, paraphrase: false, isResponse: true })
-    }
-    args.e = (c) => {
-      return config.getEvaluator(args.s, args.calls, logs, c)
-    }
-    args.gs = gs(args.g)
-    args.gsp = gs(args.gp)
-    args.gsr = gs(args.gr)
-  }
-  // for semantics
-  args.addAssumedScoped(args, {})
-
-  const getAPI = (uuid) => {
-    if (config && config.getAPI) {
-      return config.getAPI(uuid)
-    }
-  }
-  const getAPIs = (uuid) => {
-    if (config && config.getAPIs) {
-      return config.getAPIs(uuid)
-    }
-  }
-  args.getUUIDScoped = (uuid) => {
-    return {
-      api: getAPI(uuid),
-      apis: getAPIs(uuid)
-    }
-  }
-  config.getAddedArgs(args)
-
-  Object.assign(args, args.getUUIDScoped(uuidForScoping || config.uuid))
-  /*
-  if (uuidForScoping) {
-    Object.assign(args, args.getUUIDScoped(uuidForScoping))
-  }
-  */
-  // sets args for all the API. that make a copy so the args must be fully setup by here except for scoped
-  config.setArgs(args)
-}
-
-const gs = (g) => (contexts, separator, lastSeparator) => {
-  if (!Array.isArray(contexts)) {
-    debugger
-    throw new Error('Expected a list')
-  }
-
-  let s = ''
-  if (!separator) {
-    separator = ' '
-  }
-  if (!lastSeparator) {
-    lastSeparator = separator
-  }
-  let nextSeparator = ''
-  for (let i = 0; i < contexts.length; ++i) {
-    const context = contexts[i]
-    const value = g(context)
-    if (i > 0) {
-      if (i === contexts.length - 1) {
-        nextSeparator = lastSeparator
-      } else {
-        nextSeparator = separator
-      }
-    }
-    s += nextSeparator + value
-  }
-  return s
-}
-
 const matching = (actual, expected) => {
   if (!deepEqual(stringify(sortJson(actual, { depth: 25 })), stringify(sortJson(expected, { depth: 25 })))) {
     return false
@@ -290,56 +108,18 @@ const analyzeMetaData = (right, wrong) => {
   return []
 }
 
-const processContexts = (contexts, params) => {
+const processContexts = async (contexts, params) => {
   const contextsPrime = []
   const generated = []
   const logs = []
   for (const context of contexts) {
-    const result = processContext(context, Object.assign({}, params, { logs }))
+    const result = await processContext(context, Object.assign({}, params, { logs }))
     contextsPrime.push(result.context)
     generated.push(result.generated)
   }
   return { contexts: contextsPrime, generated, logs }
 }
 
-const getObjects = (objects) => {
-  return (uuid) => {
-    if (objects && objects.namespaced) {
-      return objects.namespaced[uuid]
-    }
-    return objects
-  }
-}
-
-const processContext = (context, { objects = {}, config, logs = [] }) => {
-  const generators = config.getGenerators(logs)
-  const semantics = config.getSemantics(logs)
-
-  // map to hash
-  config = config || {}
-  if (config.config) {
-    config = config
-  }
-
-  const response = {} // NA but passed in
-  // generators = new Generators(generators.map((g) => new Generator(normalizeGenerator(g))))
-  // semantics = new Semantics(semantics.map((g) => new Semantic(normalizeSemantic(g))))
-  const hierarchy = new DigraphInternal((config.config || {}).hierarchy || [])
-
-  const args = { objects, response, getObjects: getObjects(objects) }
-  setupArgs(args, config, logs, hierarchy)
-
-  context = semantics.apply(args, context)
-  const generated = generators.apply(args, context)
-  const assumed = { paraphrase: true, response: false, isResponse: false }
-  const paraphrases = generators.apply({ ...args, assumed }, context, { paraphrase: true, response: false, isResponse: false })
-  let responses = []
-  if (context.isResponse) {
-    responses = generated
-  }
-  return { context, generated, paraphrases, responses }
-}
-
 const convertToStable = (objects) => {
   if (true) {
     return objects
@@ -431,139 +211,6 @@ const overlaps = (r1, context) => {
   return false
 }
 
-const setupContexts = (rawContexts) => {
-  let first = true
-  const contexts = []
-  contexts.push({ marker: 'controlStart', controlRemove: true })
-  for (const context of rawContexts) {
-    if (first) {
-      first = false
-    } else {
-      contexts.push({ marker: 'controlBetween', controlRemove: true })
-    }
-    contexts.push(context)
-  }
-  contexts.push({ marker: 'controlEnd', controlRemove: true })
-  return contexts
-}
-
-const processContextsB = ({ config, hierarchy, semantics, generators, json, isTest, rebuildingTemplate, isInstance, instance, query, data, retries, url, commandLineArgs }) => {
-  // TODO fix this name to contextsPrime
-  const contextsPrime = []
-  const generatedPrime = []
-  const paraphrasesPrime = []
-  const paraphrasesParenthesizedPrime = []
-  const generatedParenthesizedPrime = []
-  const responsesPrime = []
-  const contexts = setupContexts(json.contexts)
-
-  const objects = config.get('objects')
-  const args = { objects, isResponse: true, response: json, isTest, isInstance, getObjects: getObjects(objects), instance }
-  if (!json.logs) {
-    json.logs = []
-  }
-  setupArgs(args, config, json.logs, hierarchy)
-  const toDo = [...contexts]
-  args.insert = (context) => toDo.unshift(context)
-  let overlap, lastRange
-  config.debugLoops = commandLineArgs && commandLineArgs.debugLoops
-  while (toDo.length > 0) {
-    const context = toDo.shift()
-    args.calls.next()
-    let contextPrime = context
-    context.topLevel = true
-    try {
-      if (json.has_errors) {
-        throw new Error('There are errors in the logs. Run with the -d flag and grep for Error')
-      }
-      const generateParenthesized = isTest || (commandLineArgs && commandLineArgs.save)
-      if (!config.get('skipSemantics')) {
-        const semantics = config.getSemantics(json.logs)
-        try {
-          contextPrime = semantics.apply(args, context)
-        } catch (e) {
-          if (e.message == 'Maximum call stack size exceeded') {
-            const mostCalled = semantics.getMostCalled()
-            e.message += `\nThe most called semantic was:\nnotes: ${mostCalled.notes}\nmatch: ${mostCalled.matcher.toString()}\napply: ${mostCalled._apply.toString()}\n`
-          }
-          // contextPrime = semantics.apply(args, { marker: 'error', context, error: e })
-          if (isInstance) {
-            console.log('error', e.error)
-          }
-          contextPrime = semantics.apply(args, {
-            marker: 'error',
-            context,
-            text: e ? e.toString() : 'not available',
-            reason: e.reason,
-            error: e.stack || e.error
-          })
-          if (rebuildingTemplate) {
-            throw e
-          }
-        }
-      }
-      if (contextPrime.controlRemove) {
-        continue
-      }
-      let assumed = { isResponse: true }
-      const generated = contextPrime.isResponse ? config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed) : ''
-      let generatedParenthesized = []
-      if (generateParenthesized) {
-        config.parenthesized = true
-        generatedParenthesized = contextPrime.isResponse ? config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed) : ''
-        config.parenthesized = false
-      }
-      // assumed = { paraphrase: true, response: false };
-      assumed = { paraphrase: true, isResponse: false, response: false }
-      if (generateParenthesized) {
-        config.parenthesized = false
-      }
-      const paraphrases = config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed)
-      let paraphrasesParenthesized = []
-      if (generateParenthesized) {
-        config.parenthesized = true
-        paraphrasesParenthesized = config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed)
-        config.parenthesized = false
-      }
-      contextsPrime.push(contextPrime)
-      generatedPrime.push(generated)
-      paraphrasesPrime.push(paraphrases)
-      if (generateParenthesized) {
-        paraphrasesParenthesizedPrime.push(paraphrasesParenthesized)
-        generatedParenthesizedPrime.push(generatedParenthesized)
-      }
-      if (contextPrime.isResponse) {
-        responsesPrime.push(generated)
-      } else {
-        responsesPrime.push('')
-      }
-
-      // add results to processed list
-      config.config.objects.processed = config.config.objects.processed || []
-      config.config.objects.processed = config.config.objects.processed.slice(0, 5)
-      config.config.objects.processed.unshift({ context: contextPrime, paraphrases: paraphrases, paraphrasesParenthesized, generatedParenthesized, responses: responsesPrime })
-    } catch (e) {
-      if (Array.isArray(e)) {
-        e = {
-          errors: e
-        }
-      }
-      e.context = contextPrime
-      if (e.logs) {
-        e.logs = e.logs.concat(json.logs)
-      } else {
-        e.logs = json.logs
-      }
-      e.metadata = json.metadata
-      if (json.trace) {
-        e.trace = json.trace
-      }
-      throw e
-    }
-  }
-  return { contextsPrime, generatedPrime, paraphrasesPrime, paraphrasesParenthesizedPrime, generatedParenthesizedPrime, responsesPrime }
-}
-
 const doWithRetries = async (n, url, queryParams, data) => {
   if (!queryParams) {
     queryParams = ''
@@ -598,93 +245,6 @@ const doWithRetries = async (n, url, queryParams, data) => {
   }
 }
 
-const setupProcessB = ({ config, initializer, allowDelta = false } = {}) => {
-  const key = config._key
-
-  const data = Object.assign({ key, version: '3' }, { uuid: config._uuid })
-  if (allowDelta && config.allowDelta && config.hasDelta()) {
-    // console.log('config', config)
-    data.delta = config.delta()
-  } else {
-    config.toData(data)
-    // Object.assign(data, config.config)
-  }
-
-  // config.toServer(data)
-
-  if (data.namespaces) {
-    for (const uuid of Object.keys(data.namespaces)) {
-      const km = config.configs.find((km) => km.uuid === uuid)
-      data.namespaces[uuid].name = km.name
-    }
-  }
-
-  // const generators = new Generators((data.generators || []).map((g) => new Generator(normalizeGenerator(g))))
-  delete data.generators
-  // const semantics = new Semantics((data.semantics || []).map((g) => new Semantic(normalizeSemantic(g))))
-  delete data.semantics
-  const hierarchy = new DigraphInternal((config.config || {}).hierarchy || [])
-
-  return {
-    data,
-    // generators,
-    // semantics,
-    hierarchy
-  }
-}
-
-// instance template loadTemplate
-const loadInstance = (config, instance) => {
-  const transitoryMode = global.transitoryMode
-  global.transitoryMode = false
-
-  if (instance && (instance.associations || instance.learned_contextual_priorities)) {
-    if (!config.config.retrain) {
-      if (instance.associations) {
-        config.addAssociations(instance.associations)
-      }
-      if (instance.learned_contextual_priorities && instance.learned_contextual_priorities.length > 0) {
-        config.addPriorities(instance.learned_contextual_priorities)
-      }
-    }
-  }
-
-  const { /* data, generators, semantics, */ hierarchy } = setupProcessB({ config })
-  // for (const results of (instance.resultss || [])) {
-  for (const i in (instance.resultss || [])) {
-    const results = instance.resultss[i]
-    if (results.extraConfig) {
-      // config.addInternal(results, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false)
-      const uuid = config.nameToUUID(instance.name)
-      // used to do a CLONE
-      config.addInternal(instance.template.configs[i], { uuid, addFirst: true, handleCalculatedProps: true })
-    } else if (results.apply) {
-      const objects = config.get('objects')
-      const args = { objects, getObjects: getObjects(objects) }
-      if (instance.configs) {
-        args.isInstance = `instance${i}`
-        args.instance = instance.configs[i]
-      }
-
-      const uuid = config.nameToUUID(instance.name)
-      setupArgs(args, config, config.logs, hierarchy, uuid)
-      results.apply(args)
-    } else {
-      if (results.skipSemantics) {
-        config.config.skipSemantics = results.skipSemantics
-      }
-      const args = { config, hierarchy, json: results, commandLineArgs: {} }
-      args.isInstance = `instance${i}`
-      args.instance = ''
-      processContextsB(args)
-      if (results.skipSemantics) {
-        config.config.skipSemantics = null
-      }
-    }
-  }
-  global.transitoryMode = transitoryMode
-}
-
 const throwErrorHandler = (error) => {
   throw error
 }
@@ -701,7 +261,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
   // ensure same start state
   try {
     if (writeTests) {
-      config.rebuild()
+      await config.rebuild()
       const objects = getObjects(config.config.objects)(config.uuid)
     }
   } catch (error) {
@@ -773,7 +333,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
           start = runtime.performance.performance.now()
         }
         const { contextsPrime, generatedPrime, paraphrasesPrime, paraphrasesParenthesizedPrime, generatedParenthesizedPrime, responsesPrime } =
-                                  processContextsB({ isTest, rebuildingTemplate, config, hierarchy, json, commandLineArgs /*, generators, semantics */ })
+                                  await processContextsB({ isTest, rebuildingTemplate, config, hierarchy, json, commandLineArgs /*, generators, semantics */ })
         if (isTest) {
           end = runtime.performance.performance.now()
           clientSideTime = end - start
@@ -865,8 +425,12 @@ const getConfigForTest = (config, testConfig) => {
 
 const runTest = async (config, expected, { args, verbose, testConfig, debug }) => {
   const test = expected.query
+  if (args.query && args.query != test) {
+    // no run this
+    return
+  }
   // initialize in between test so state is not preserved since the test was adding without state
-  config.rebuild()
+  await config.rebuild()
   const errorHandler = (error) => {
     if (error.metadata) {
       const priorities = analyzeMetaData(expected.metadata, error.metadata)
@@ -1012,7 +576,7 @@ const runTests = async (config, testFile, juicyBits) => {
 }
 
 const saveTest = async (testFile, config, test, expected, testConfig, saveDeveloper) => {
-  config.rebuild()
+  await config.rebuild()
   const objects = getObjects(config.config.objects)(config.uuid)
   console.log(test)
   const result = await _process(config, test, { isTest: true })
@@ -1033,11 +597,11 @@ const saveTestsHelper = async (testFile, config, tests, todo, testConfig, saveDe
     return
   }
   const test = todo.pop()
-  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})
-  config.rebuild()
+  await config.rebuild()
   return saveTestsHelper(testFile, config, tests, todo, testConfig, saveDeveloper)
 }
 
@@ -1324,6 +888,7 @@ const rebuildTemplate = async ({ config, target, previousResultss, startOfChange
     associations: [],
     learned_contextual_priorities: []
   }
+  config.fragmentsBeingBuilt = []
   const looper = async (configs) => {
     if (configs.length === 0) {
       finish()
@@ -1331,14 +896,15 @@ const rebuildTemplate = async ({ config, target, previousResultss, startOfChange
     }
     const { property, hierarchy, query: queryOrExtraConfig, previousResults, initializer, skipSemantics } = configs.shift()
     // queries are strings or { query: "blah", development: true/false }
-    if (typeof queryOrExtraConfig === 'string' || queryOrExtraConfig.query) {
+    if (typeof queryOrExtraConfig === 'string' || queryOrExtraConfig.query || queryOrExtraConfig.isFragment) {
       let query = queryOrExtraConfig
+      let isFragment = queryOrExtraConfig.isFragment
       if (typeof queryOrExtraConfig === 'string') {
         query = { query }
       }
-      config.config.skipSemantics = skipSemantics
+      config.config.skipSemantics = skipSemantics && !isFragment
       const transitoryMode = global.transitoryMode
-      if (property == 'fragments') {
+      if (isFragment || property == 'fragments') {
         global.transitoryMode = true
       }
       if (hierarchy) {
@@ -1356,7 +922,7 @@ const rebuildTemplate = async ({ config, target, previousResultss, startOfChange
         if (previousResults && previousResults.query == query.query) {
           results = previousResults
           prMessage = ' Using previous results. use -rtf for a hard rebuild of everything on the server side.'
-          loadInstance(config, { resultss: [results] })
+          await loadInstance(config, { resultss: [results] })
         } else {
           results = await _process(config, query.query, { initializer, rebuildingTemplate: true })
         }
@@ -1370,15 +936,19 @@ const rebuildTemplate = async ({ config, target, previousResultss, startOfChange
         } else if (results.paraphrases[0] != query.query) {
           console.log(`query "${query.query}". The paraphrase is different from the query "${results.paraphrases[0]}".${prMessage}`)
         } else {
-          console.log(`query "${query.query}".${prMessage}`)
+          console.log(`query ${isFragment ? 'fragment' : ''}"${query.query}".${prMessage}`)
         }
         global.transitoryMode = transitoryMode
         config.config.skipSemantics = null
         results.query = query.query
+        results.isFragment = isFragment
         results.skipSemantics = skipSemantics
         results.development = query.development
         results.key = { query: query.query, hierarchy }
         accumulators[property].push(results)
+        if (isFragment) {
+          config.fragmentsBeingBuilt.push({ query: query.query, contexts: results.contexts })
+        }
         accumulators.associations = accumulators.associations.concat(results.associations)
         accumulators.learned_contextual_priorities = accumulators.learned_contextual_priorities.concat(results.learned_contextual_priorities)
         await looper(configs)
@@ -1392,7 +962,7 @@ const rebuildTemplate = async ({ config, target, previousResultss, startOfChange
       const initFunction = queryOrExtraConfig
       const objects = config.get('objects')
       const args = { objects, getObjects: getObjects(objects) }
-      setupArgs(args, config, config.logs, hierarchy)
+      setupArgs(args, config, config.logs, config.hierarchy)
       initFunction(args)
       accumulators[property].push({ apply: queryOrExtraConfig })
       await looper(configs)
@@ -1417,6 +987,7 @@ const rebuildTemplate = async ({ config, target, previousResultss, startOfChange
   }
 
   const finish = () => {
+    config.fragmentsBeingBuilt = []
     const instanceName = `${target}.instance.json`
     console.log(`Writing instance file ${instanceName}`)
     const stabilizeAssociations = (associations) => {
@@ -1505,11 +1076,15 @@ const checkTest = (testConfig) => {
 }
 
 const knowledgeModuleImpl = async ({
+  includes,
+  config : configStruct,
+  api,
+  initializer,
+  multiApiInitializer,
+
   module: moduleFromJSFile,
   description,
   section,
-  // config, createConfig,
-  createConfig,
   newWay,
   demo,
   test,
@@ -1517,7 +1092,6 @@ const knowledgeModuleImpl = async ({
   errorHandler = defaultErrorHandler,
   process: processResults = defaultProcess,
   stopAtFirstFailure = true,
-  acceptsAdditionalConfig = false,
   ...rest
 } = {}) => {
   const unknownArgs = Object.keys(rest)
@@ -1530,10 +1104,28 @@ const knowledgeModuleImpl = async ({
   if (!moduleFromJSFile) {
     throw new Error("'module' is a required parameter. The value should be either 'module' or a lambda that will be called when the file is acting as a module.")
   }
-  // if (!config && !createConfig) {
-  if (!createConfig) {
+
+  if (!configStruct) {
     throw new Error("'config' or 'createConfig' is a required parameter. The value should the config that defines the knowledge module.")
   }
+
+  const createConfig = async () => {
+    const config = new Config(configStruct, moduleFromJSFile, _process)
+    config.stop_auto_rebuild()
+    await config.add(...(includes || []))
+    if (api) {
+      config.setApi(api)
+    }
+    if (multiApiInitializer) {
+      await config.setMultiApi(multiApiInitializer)
+    }
+    if (initializer) {
+      config.initializer(initializer)
+    }
+    await config.restart_auto_rebuild()
+    return config
+  }
+
   if (!description) {
     throw new Error("'description' is a required parameter. The value should the description of the knowledge module.")
   }
@@ -1582,7 +1174,7 @@ const knowledgeModuleImpl = async ({
     parser.add_argument('-t', '--test', { action: 'store_true', help: 'Run the tests. Create tests by running with the --query + --save flag' })
     parser.add_argument('-tv', '--testVerbose', { action: 'store_true', help: 'Run the tests in verbose mode. Create tests by running with the --query or --loop with the --save flag' })
     // parser.add_argument('-ttr', '--testToRun', { help: 'Only the specified test will be run' })
-    parser.add_argument('-tva', '--testAllVerbose', { action: 'store_true', help: 'Run the tests in verbose mode. All the tests will be run instead of stopping at first failure. Create tests by running with the --query or --loop with the --save flag' })
+    parser.add_argument('-tva', '--testAllVerbose', { action: 'store_true', help: 'Run the tests in verbose mode. All the tests will be run instead of stopping at first failure. Create tests by running with the --query or --loop with the --save flag. if -q is specified the tests will be run for just the specified query.' })
     parser.add_argument('-tnp', '--testNoParenthesized', { action: 'store_true', help: 'Don\' check parenthesized differences for the tests' })
     parser.add_argument('-n', '--count', { help: 'Number of times to run the tests. Default is one. Use this to check for flakey test. If possible the system will print out a message with the word "hint" suggesting how to fix the problem' })
     // parser.add_argument('-b', '--build', { help: 'Specify the template file name of the form <kmName>. There should be a file called <baseKmName>.<kmName>.template.json with the queries to run. For example { queries: [...] }. The template file will be run and generate an instantiation called <baseKmName>.<kmName>.instance.json and a file called <kmName>.js that will load the template file (this is file generated only if not already existing) and a test file called <KmName>.tests.json. This can then be loaded into an instance of the current knowledge module to setup initial conditions.' })
@@ -1628,7 +1220,7 @@ const knowledgeModuleImpl = async ({
       global.pauseDebugging = true
     }
 
-    const config = createConfig()
+    const config = await createConfig()
     setupConfig(config)
     processResults = processResults({ config, errorHandler })
 
@@ -1663,7 +1255,7 @@ const knowledgeModuleImpl = async ({
           throw new Error('Error for the checkForLoop argument. Expected a JSON array of operator keys of the form "[<id>, <level>]"')
         }
       } catch (e) {
-        throw new Error(`Error parsing JSON of the checkForLoop argument. ${e}`)
+        throw new Error('Error for the checkForLoop argument. Expected a JSON array of operator keys of the form "[<id>, <level>]"')
       }
     } else {
       if (process.argv.includes('--checkForLoop') || process.argv.includes('-cl')) {
@@ -1773,7 +1365,7 @@ const knowledgeModuleImpl = async ({
           // { literals: Object, patterns: Array(2), hierarchy: Array(97) }
           console.log('literals')
           for (const word in config.config.words.literals) {
-            console.log('  ' + word.concat('          ', ...config.config.words.literals[word].map((def) => JSON.stringify(def))))
+            console.log('  ' + word.concat(...config.config.words.literals[word].map((def, i) => ((i > 0) ? ' '.repeat(4+word.length) : '  ') + JSON.stringify(def) + '\n')))
           }
           console.log('patterns')
           for (const pattern of config.config.words.patterns) {
@@ -1860,7 +1452,7 @@ const knowledgeModuleImpl = async ({
         config.config.rebuild = true
       }
       try {
-        config.load(template.template, template.instance, { rebuild: needsRebuild.needsRebuild || options.rebuild, previousResultss: needsRebuild.previousResultss, startOfChanges: needsRebuild.startOfChanges })
+        await config.load(rebuildTemplate, template.template, template.instance, { rebuild: needsRebuild.needsRebuild || options.rebuild, previousResultss: needsRebuild.previousResultss, startOfChanges: needsRebuild.startOfChanges })
       } catch (e) {
         console.error(`Error loading template for ${config.name}. ${e.error ? e.error : e}${e.stack ? e.stack : ''}`)
         runtime.process.exit(-1)
@@ -1877,6 +1469,9 @@ const knowledgeModuleImpl = async ({
       config.config.retrain = true
     }
 
+    if (args.saveDeveloper) {
+      args.save = true
+    }
     if (args.test || args.testVerbose || args.testAllVerbose || args.save) {
       global.transitoryMode = true
     }
@@ -1994,7 +1589,7 @@ const knowledgeModuleImpl = async ({
                     lines.setElement(2, 2, JSON.stringify(result.actual.checked, null, 2))
                     lines.log()
                     if (args.vimdiff) {
-                      vimdiff(result.actual.checked, result.expected.checked)
+                      show('checked properties for objects', result.expected.checked, result.actual.checked)
                     }
                     newError = true
                     headerShown = true
@@ -2012,7 +1607,7 @@ const knowledgeModuleImpl = async ({
                     lines.setElement(2, 2, JSON.stringify(result.actual.checkedContexts, null, 2))
                     lines.log()
                     if (args.vimdiff) {
-                      vimdiff(result.actual.checkedContexts, result.expected.checkedContexts)
+                      show('checked properties for context', result.expected.checkedContexts, result.actual.checkedContexts)
                     }
                     newError = true
                     headerShown = true
@@ -2105,9 +1700,11 @@ const knowledgeModuleImpl = async ({
     }
     printConfig()
   } else {
-    const initConfig = (config) => {
+    const initConfig = async (config) => {
       if (template) {
         if (config.needsRebuild(template.template, template.instance, { isModule: !isProcess }).needsRebuild) {
+          debugger
+          config.needsRebuild(template.template, template.instance, { isModule: !isProcess })
           const error = `This module "${config.name}" cannot be used because the instance file needs rebuilding. Run on the command line with no arguments or the -rt argument to rebuild.`
           throw new Error(error)
         }
@@ -2140,24 +1737,21 @@ const knowledgeModuleImpl = async ({
 
       if (template) {
         try {
-          config.load(template.template, template.instance)
+          await config.load(rebuildTemplate, template.template, template.instance)
         } catch (e) {
           errorHandler(e)
         }
       }
     }
 
-    createConfigExport = (additionalConfig) => {
-      if (createConfig.cached) {
+    // no cache 21 minutes + rebuild fails "node tester_rebuild -m colors"
+    // cache okay
+    createConfigExport = async () => {
+      if (false && createConfig.cached) {
         return createConfig.cached
       }
-      const config = createConfig(acceptsAdditionalConfig ? additionalConfig : null)
-      if (!acceptsAdditionalConfig && additionalConfig) {
-        config.stop_auto_rebuild()
-        additionalConfig(config)
-        config.restart_auto_rebuild()
-      }
-      initConfig(config)
+      const config = await createConfig()
+      await initConfig(config)
       // config.rebuild({ isModule: true })
       createConfig.cached = config
       return createConfig.cached
@@ -2186,11 +1780,6 @@ const ensureTestFile = (module, name, type) => {
   }
 }
 
-function w (func) {
-  func.where = where(3)
-  return func
-}
-
 const knowledgeModule = async (...args) => {
   await knowledgeModuleImpl(...args).catch((e) => {
     console.error(e)
@@ -2201,9 +1790,6 @@ const knowledgeModule = async (...args) => {
 module.exports = {
   process: _process,
   stableId,
-  where,
-  w,
-  // submitBug,
   ensureTestFile,
   rebuildTemplate,
   processContext,