theprogrammablemind_4wp 9.3.0-beta.54 → 9.3.0-beta.56

package/client.js

@@ -50,8 +50,8 @@ const getConfig_getContextCheck = (testConfig) => {
   return (testConfig.checks && testConfig.checks.context) || []
 }
 
-const pickContext = (testConfig) => (context) => {
-  return project2(context, getConfig_getContextCheck(testConfig))
+const pickContext = (contextChecks) => (context) => {
+  return project2(context, contextChecks)
 }
 
 const pickObjects = (config, testConfig, getObjects) => {
@@ -520,8 +520,9 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug, tim
       failed_generatedParenthesized = false
     }
 
-    const pickedResultContexts = result.contexts.map(pickContext(testConfig))
-    const pickedExpectedContexts = expected.contexts.map(pickContext(testConfig))
+    const contextChecks = config.getContextChecks()
+    const pickedResultContexts = result.contexts.map(pickContext(contextChecks))
+    const pickedExpectedContexts = expected.contexts.map(pickContext(contextChecks))
     const failedCheckedContexts = !matching(pickedResultContexts, pickedExpectedContexts)
 
     const expectedGetObjects = (name) => {
@@ -885,7 +886,8 @@ const defaultInnerProcess = (config, errorHandler, responses) => {
     console.log(JSON.stringify(picked, null, 2))
   }
 
-  const pickedResultContexts = responses.contexts.map(pickContext(config.testConfig))
+  const contextChecks = config.getContextChecks()
+  const pickedResultContexts = responses.contexts.map(pickContext(contextChecks))
   if (pickedResultContexts.some((context) => Object.keys(context).length > 0)) {
     console.log('--- Contexts showing only the checked values ---')
     console.log(JSON.stringify(pickedResultContexts, null, 2))

package/package.json

@@ -70,6 +70,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.3.0-beta.54",
+  "version": "9.3.0-beta.56",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -335,6 +335,16 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
           config.addPriority({ context: [[bridge.id, bridge.level], after], choose: [0] })
         }
       }
+      if (bridge.check) {
+        if (!config.testConfig?.checks?.context) {
+          config.testConfig.checks.context = []
+        }
+        config.testConfig.checks.context.push({
+          match: ({context}) => context.marker == bridge.id,
+          exported: true,
+          apply: ({context}) => bridge.check,
+        })
+      }
       if (bridge.after) {
         for (let before of bridge.after) {
           if (typeof before === 'string') {
@@ -473,7 +483,7 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
   if (moreConfig.bridges) {
     moreConfig.bridges = moreConfig.bridges.map((bridge) => {
       bridge = { ...bridge }
-      const valid = ['after', 'conditional', 'associations', 'before', 'bridge', 'disabled', 'development', 'skipable', 'return_type_selector', 'evaluator', 'evaluators', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'operator', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
+      const valid = ['after', 'conditional', 'associations', 'before', 'bridge', 'check', 'disabled', 'development', 'skipable', 'return_type_selector', 'evaluator', 'evaluators', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'operator', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
         'level', 'optional', 'selector', 'semantic', 'semantics', 'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid']
       helpers.validProps(valid, bridge, 'bridge')
       handleBridgeProps(baseConfig, bridge, { addFirst, uuid })
@@ -878,6 +888,7 @@ class Config {
   getInfo () {
     const name = this.name
     const includes = this.configs.slice(1).map((km) => km.config.name)
+    includes.sort()
     const visibleExamples = []
     for (const test of this.tests) {
       if (!test.developerTest) {
@@ -2596,6 +2607,24 @@ class Config {
     })
   }
 
+  getContextChecks() {
+    const allChecks = []
+    for (const name of this.loadOrdering) {
+      const checks = this.kms[name].testConfig?.checks?.context || []
+      for (const check of checks) {
+        if (check.exported) {
+          allChecks.push(check)
+        }
+      }
+    }
+    for (const check of this.testConfig?.checks?.context || []) {
+      if (!check.exported) {
+        allChecks.push(check)
+      }
+    }
+    return allChecks
+  }
+
   // rebuild ({ isModule: mainIsModule = false } = {}) {
   async rebuild ({ isModule: mainIsModule } = {}) {
     if (this._stop_auto_rebuild) {
@@ -2623,6 +2652,7 @@ class Config {
     // reorder configs base on load ordering
     {
       const ordering = this.loadOrder.order(this.configs.map((km) => km.name || km.uuid))
+      this.loadOrdering = ordering
       const oconfigs = []
       for (const nameOrUUID of ordering) {
         for (const km of this.configs) {