theprogrammablemind_4wp 9.6.3-beta.22 → 9.6.3-beta.24

package/package.json

@@ -73,6 +73,6 @@
     "scriptjs": "^2.5.9",
     "uuid": "^8.3.2"
   },
-  "version": "9.6.3-beta.22",
+  "version": "9.6.3-beta.24",
   "license": "UNLICENSED"
 }

package/src/fragments.js

@@ -1,18 +1,6 @@
 const _ = require('lodash')
 const helpers = require('./helpers')
 
-function pathEquals (p1, p2) {
-  if (p1.length !== p2.length) {
-    return false
-  }
-  for (let i = 0; i < p1.length; ++i) {
-    if (p1[i] !== p2[i]) {
-      return false
-    }
-  }
-  return true
-}
-
 function fragmentInstantiator (args, contexts) {
   return new Object({ 
     contexts: () => {
@@ -22,7 +10,7 @@ function fragmentInstantiator (args, contexts) {
       const instantiated = _.cloneDeep(contexts)
       const todo = [{ context: instantiated, path: [] }]
       args = { ...args }
-      args.pathEquals = pathEquals
+      args.pathEquals = helpers.pathEquals
       while (todo.length > 0) {
         const { context, path } = todo.pop()
         args.context = context

package/src/helpers.js

@@ -1,6 +1,22 @@
 const deepEqual = require('deep-equal')
 const stringify = require('json-stable-stringify')
 
+function pathEquals (p1, p2) {
+  if (p1.length !== p2.length) {
+    return false
+  }
+  for (let i = 0; i < p1.length; ++i) {
+    if (typeof p2[i] == 'function') {
+      if (!p2[i](p1[i])) {
+        return false
+      }
+    } else if (p1[i] !== p2[i]) {
+      return false
+    }
+  }
+  return true
+}
+
 function watchProperty(obj, propName) {
   let value = obj[propName];
 
@@ -594,4 +610,5 @@ module.exports = {
   setByPath,
   assignAssumed,
   watchProperty,
+  pathEquals,
 }

package/src/project2.js

@@ -1,4 +1,5 @@
 const debug = require('./debug')
+const helpers = require('./helpers')
 
 function areFirstNEqual(arr1, arr2, n) {
   if (n <= 0) return true;
@@ -36,8 +37,8 @@ function project(source, filters, path=[]) {
   }
 
   // Find the applicable filter for the current context
-  const filter = filters.find(f => f.match({ context: source }));
-  if (!filter) {
+  const selectedFilters = filters.filter(f => f.match({ context: source, path, pathEquals: helpers.pathEquals }));
+  if (filters.length == 0) {
     if (Array.isArray(source)) {
       return source.map((element) => project(element, filters, [...path, '*']))
     }
@@ -45,7 +46,12 @@ function project(source, filters, path=[]) {
   }
 
   // Get the properties to include from the apply function
-  let properties = filter.apply(source);
+  let properties = []
+  for (const filter of selectedFilters) {
+    for (const property of filter.apply(source)) {
+      properties.push(property)
+    }
+  }
   if (source?.checks) {
     for (const check of source.checks) {
       properties.push(check)
@@ -75,7 +81,7 @@ function project(source, filters, path=[]) {
         result[endProp] = source[endProp]
       } else if (Array.isArray(source[endProp])) {
         result[endProp] = []
-        for (const key in source[endProp]) {
+        for (const key of source[endProp].keys()) {
           result[endProp].push(project(source[endProp][key], filters, [...path, endProp, key]))
         }
       } else {
@@ -96,7 +102,19 @@ function project(source, filters, path=[]) {
       // If the property is an object and not null, recursively project it
       if (typeof source[prop.property] === 'object' && source[prop.property] !== null) {
         result[prop.property] = {}
-        for (const key of prop.check) {
+        const instantiatedCheck = []
+        for (const check of prop.check) {
+          if (typeof check.property == 'function') {
+            for (const sourceKey of source[prop.property].keys()) {
+              if (check.property(sourceKey)) {
+                instantiatedCheck.push({ property: sourceKey, check: check.check })
+              }
+            }
+          } else {
+            instantiatedCheck.push(check)
+          }
+        }
+        for (const key of instantiatedCheck) {
           if (typeof key == 'string') {
             result[prop.property][key] = project(source[prop.property][key], filters, [...path, prop.property, key]);
           } else {
@@ -104,7 +122,7 @@ function project(source, filters, path=[]) {
               match: () => true,
               apply: () => key.check
             }
-            result[prop.property][key.property] = project(source[prop.property][key.property], [f], [...path, prop.property, key.property]);
+            result[prop.property][key.property] = project(source[prop.property][key.property], [...filters, f], [...path, prop.property, key.property]);
           }
         }
       } else {

package/src/semantics.js

@@ -206,6 +206,7 @@ class Semantics {
           }
           args._continue = _continue
           if (process.env.TPMKMS_TRACE) {
+            console.error(semantic.toLabel())
             console.error(semantic.toString())
           }
           contextPrime = await semantic.apply(args, context, s, options)