theprogrammablemind_4wp 9.3.0-beta.53 → 9.3.0-beta.55

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

@@ -53,6 +53,7 @@
     "src/digraph_internal.js",
     "src/generators.js",
     "src/project.js",
+    "src/project2.js",
     "src/semantics.js"
   ],
   "author": "dev@thinktelligence.com",
@@ -69,6 +70,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.3.0-beta.53",
+  "version": "9.3.0-beta.55",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -878,6 +878,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 +2597,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 +2642,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) {

package/src/project2.js

@@ -0,0 +1,54 @@
+function project(source, filters) {
+  if (['string', 'number'].includes(typeof source)) {
+    return source
+  }
+
+  if (Object.keys(source).length === 0 && filters.length === 0) {
+    return {};
+  }
+
+  // Find the applicable filter for the current context
+  const filter = filters.find(f => f.match({ context: source }));
+  if (!filter) {
+    if (Array.isArray(source)) {
+      return source.map((element) => project(element, filters))
+    }
+    return {};
+  }
+
+  // Get the properties to include from the apply function
+  let properties = filter.apply();
+
+  // update 
+  const updatedProperties = []
+  for (const property of properties) {
+    if (property.properties) {
+      for (const moreProperty of source[property.properties] || []) {
+        updatedProperties.push(moreProperty)
+      }
+    } else {
+      updatedProperties.push(property)
+    }
+  }
+  properties = updatedProperties
+
+  // Build the result object
+  const result = {};
+  properties.forEach(prop => {
+    if (source.hasOwnProperty(prop)) {
+      // If the property is an object and not null, recursively project it
+      if (typeof source[prop] === 'object' && source[prop] !== null) {
+        result[prop] = project(source[prop], filters);
+      } else {
+        // Copy primitive or null properties directly
+        result[prop] = source[prop];
+      }
+    }
+  });
+
+  return result;
+}
+
+module.exports = {
+  project
+}