theprogrammablemind_4wp 7.12.4-beta.0 → 7.12.4-beta.2

package/client.js

@@ -14,8 +14,17 @@ const { appendNoDups, InitCalls, updateQueries, safeNoDups } = require('./src/he
 const runtime = require('./runtime')
 const sortJson = runtime.sortJson
 
-const getConfig_getObjectsCheck = (testConfig) => {
-  return (testConfig.checks && testConfig.checks.objects) || []
+const getConfig_getObjectsCheck = (config, testConfig) => {
+  let testConfigName = config.name
+  if (testConfig.testModuleName) {
+    testConfigName = testConfig.testModuleName
+  }
+  const checks = (testConfig.checks && testConfig.checks.objects) || []
+  if (Array.isArray(checks)) {
+    return { [testConfigName]: checks }
+  } else {
+    return checks
+  }
 }
 
 const getConfig_getContextCheck = (testConfig) => {
@@ -26,8 +35,24 @@ const pickContext = (testConfig) => (context) => {
   return project(context, getConfig_getContextCheck(testConfig))
 }
 
-const pickObjects = (testConfig, objects) => {
-  return project(objects, getConfig_getObjectsCheck(testConfig))
+const pickObjects = (config, testConfig, getObjects) => {
+  /*
+  let testConfigName = config.name
+  if (testConfig.testModuleName) {
+    objects = getObjects(config.config.objects)(config.getConfigs()[testConfig.testModuleName].uuid)
+    testConfigName = testConfig.testModuleName
+  }
+  */
+  const checks = getConfig_getObjectsCheck(config, testConfig)
+  const projection = {}
+  for (let km in checks) {
+    const objects = getObjects(km)
+    if (!objects) {
+      throw new Error(`In the checks for ${config.name} the KM ${km} does not exist`)
+    }
+    projection[km] = project(objects, checks[km])
+  }
+  return projection
 }
 
 // move ask to the KM's since verbatim is called
@@ -105,6 +130,9 @@ const vimdiff = (actualJSON, expectedJSON, title) => {
 }
 
 const listable = (hierarchy) => (c, type) => {
+  if (!c) {
+    return false
+  }
   if (hierarchy.isA(c.marker, type)) {
     return true
   }
@@ -119,6 +147,9 @@ const listable = (hierarchy) => (c, type) => {
 }
 
 const isA = (hierarchy) => (child, parent) => {
+  if (!child || !parent) {
+    return false
+  }
   if (child.marker) {
     child = child.marker
   }
@@ -148,6 +179,7 @@ class ErrorReason extends Error {
 
 const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   config.setArgs(args)
+  // 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])
@@ -657,10 +689,8 @@ const loadInstance = (config, instance) => {
         config.config.skipSemantics = results.skipSemantics
       }
       const args = { config, hierarchy, json: results, commandLineArgs: {} }
-      if (instance.queries) {
-        args.isInstance = `instance${i}`
-        args.instance = instance.queries[i]
-      }
+      args.isInstance = `instance${i}`
+      args.instance = ''
       processContextsB(args)
       if (results.skipSemantics) {
         config.config.skipSemantics = null
@@ -852,11 +882,6 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug }) =
   }
 
   let objects = getObjects(config.config.objects)(config.uuid)
-  let testConfigName = config.name
-  if (testConfig.testModuleName) {
-    objects = getObjects(config.config.objects)(config.getConfigs()[testConfig.testModuleName].uuid)
-    testConfigName = testConfig.testModuleName
-  }
   try {
     const result = await _process(config, test, { errorHandler, isTest: true })
     result.query = test
@@ -896,7 +921,7 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug }) =
       }
       return expected.objects.namespaced[expected.objects.nameToUUID[name]] || {}
     }
-    const expected_checked = sortJson(pickObjects(testConfig, expectedGetObjects(testConfigName)), { depth: 25 })
+    const expected_checked = sortJson(pickObjects(config, testConfig, expectedGetObjects), { depth: 25 })
     const actualGetObjects = (name) => {
       if (!name) {
         name = config.name
@@ -904,7 +929,7 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug }) =
       const km = config.configs.find((km) => km.name == name)
       return config.config.objects.namespaced[km.uuid] || {}
     }
-    const actual_checked = sortJson(pickObjects(testConfig, actualGetObjects(testConfigName)), { depth: 25 })
+    const actual_checked = sortJson(pickObjects(config, testConfig, actualGetObjects), { depth: 25 })
     const failed_checked = !matching(actual_objects, expected_objects)
 
     const failed_checks = !matching(actual_objects, expected_objects)
@@ -1233,8 +1258,15 @@ const defaultInnerProcess = (config, errorHandler, responses) => {
       console.log(`    inputs: ${JSON.stringify(inputs)} output: ${JSON.stringify(output)}  reason: ${reason}`)
     }
   }
-  const objects = config.get('objects').namespaced[config.uuid]
-  const picked = sortJson(pickObjects(config.testConfig, objects), { depth: 25 })
+  // const objects = config.get('objects').namespaced[config.uuid]
+  const actualGetObjects = (name) => {
+    if (!name) {
+      name = config.name
+    }
+    const km = config.configs.find((km) => km.name == name)
+    return config.config.objects.namespaced[km.uuid] || {}
+  }
+  const picked = sortJson(pickObjects(config, config.testConfig, actualGetObjects), { depth: 25 })
   if (!_.isEmpty(picked)) {
     console.log('--- Object showing only the checked values ---')
     console.log(JSON.stringify(picked, null, 2))
@@ -2046,6 +2078,13 @@ const knowledgeModuleImpl = async ({
       })
       f()
     } else if (args.query) {
+      let useTestConfig = testConfig
+      if (args.testModuleName) {
+        config.testConfig.testModuleName = args.testModuleName
+        config.testConfig.checks = config.getConfigs()[args.testModuleName].getTestConfig().checks
+        // useTestConfig = config.getConfigs()[args.testModuleName].getTestConfig()
+        // useTestConfig.testModuleName = args.testModuleName
+      }
       const objects = getObjects(config.config.objects)(config.uuid)
       // for the compare
       if (args.objectDiff) {

package/package.json

@@ -65,6 +65,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.12.4-beta.0",
+  "version": "7.12.4-beta.2",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -199,7 +199,7 @@ const priority_valid = (cp) => {
   )
 }
 
-const handleBridgeProps = (config, bridge, addFirst) => {
+const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
   ecatch(`While processing the bridge for ${bridge.id}#${bridge.level}`,
     () => {
       if (!bridge.bridge) {
@@ -260,7 +260,8 @@ const handleBridgeProps = (config, bridge, addFirst) => {
       }
       */
 
-      const addUUID = (obj) => { return { ...obj, uuid: config.uuid } }
+      const addUUID = (obj) => { return { ...obj, uuid: uuid || config.uuid } }
+
       if (bridge.generators) {
         const generators = [...bridge.generators]
         generators.reverse()
@@ -343,14 +344,14 @@ const handleBridgeProps = (config, bridge, addFirst) => {
   )
 }
 
-const handleCalculatedProps = (baseConfig, moreConfig, addFirst) => {
+const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {}) => {
   if (moreConfig.bridges) {
     moreConfig.bridges = moreConfig.bridges.map((bridge) => {
       bridge = { ...bridge }
       const valid = ['after', 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
         'level', 'optional', 'selector', 'semantic', 'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid']
       helpers.validProps(valid, bridge, 'bridge')
-      handleBridgeProps(baseConfig, bridge, addFirst)
+      handleBridgeProps(baseConfig, bridge, { addFirst, uuid })
       return bridge
     })
   }
@@ -1314,7 +1315,7 @@ class Config {
     if (global.transitoryMode) {
       def.transitoryMode = true
     }
-    handleBridgeProps(this, def)
+    handleBridgeProps(this, def, { uuid })
     bridges.push(def)
     this.checkBridges()
     this._delta.json.bridges.push({ action: 'add', bridge: def })
@@ -2842,7 +2843,7 @@ class Config {
     debugConfigProps(more)
 
     if (hcps) {
-      handleCalculatedProps(this, more, addFirst)
+      handleCalculatedProps(this, more, { addFirst, uuid })
       applyUUID(more, uuid || this._uuid)
     }
     for (const key of Object.keys(more)) {