theprogrammablemind 7.5.8-beta.93 → 7.5.8-beta.94

package/client.js

@@ -838,7 +838,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()), { depth: 25 })
+      const expected_checked = sortJson(pickObjects(testConfig, expectedGetObjects(testConfigName)), { depth: 25 })
       const actualGetObjects = (name) => {
         if (!name) {
           name = config.name

package/package.json

@@ -64,6 +64,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.8-beta.93",
+  "version": "7.5.8-beta.94",
   "license": "ISC"
 }

package/src/config.js

@@ -986,16 +986,34 @@ class Config {
       } else {
         const config = { ...queryOrConfig }
         delete config.where
+        config.operators = (config.operators || []).map( (operator) => {
+          if (typeof operator == 'string') {
+            return { pattern: operator }
+          } else {
+            operator = { ...operator }
+            delete operator.uuid
+            return operator
+          }
+        })
+        config.bridges = (config.bridges || []).map( (bridge) => {
+          bridge = { ...bridge },
+          bridge.level = bridge.level || 0
+          delete bridge.uuid
+          return bridge
+        })
         if (options.isModule) {
           // things like webpack rewrite the functions if there are constants so this compare does not work
           delete config.generators;
           delete config.semantics;
-          (config.bridges || []).forEach((bridge) => {
+          config.bridges = (config.bridges || []).map((bridge) => {
+            bridge = {...bridge}
+            delete bridge.where
             delete bridge.generatorp
             delete bridge.generatorr
             delete bridge.generatorpr
             delete bridge.evaluator
             delete bridge.semantic
+            return bridge
           });
         } else {
           config.generators = (config.generators || []).map((generator) => {
@@ -1044,17 +1062,19 @@ class Config {
 
     const debug = false
     if (debug) {
-      if (!sameQueries) {
-        debugger
-        debugger
-      }
-      console.log("instance", instance)
-      console.log("sameQueries", sameQueries)
-      console.log("sameFragments", sameFragments)
-      console.log("templateFragments", templateFragments)
-      console.log("instanceFragments", instanceFragments)
-      console.log('template.queries', toCanonicalQueries(template.queries || []).map(helpers.updateQueries))
-      console.log("instance.queries", toCanonicalQueries(instance.queries || []))
+      if (!(instance && sameQueries && sameFragments)) {
+        if (!sameQueries) {
+          debugger
+          debugger
+        }
+        console.log("instance", instance)
+        console.log("sameQueries", sameQueries)
+        console.log("sameFragments", sameFragments)
+        console.log("templateFragments", templateFragments)
+        console.log("instanceFragments", instanceFragments)
+        console.log('template.queries', JSON.stringify(toCanonicalQueries(template.queries || []).map(helpers.updateQueries), null, 2))
+        console.log("instance.queries", JSON.stringify(toCanonicalQueries(instance.queries || []), null, 2))
+      }
     }
     return !(instance && sameQueries && sameFragments)
   }