theprogrammablemind_4wp 7.5.4-beta.4 → 7.5.4-beta.5

package/client.js

@@ -8,7 +8,7 @@ const _ = require('lodash')
 const stringify = require('json-stable-stringify')
 const Lines = require('./lines')
 const flattens = require('./src/flatten')
-const { appendNoDups, InitCalls } = require('./src/helpers')
+const { appendNoDups, InitCalls, updateQueries } = require('./src/helpers')
 const runtime = require('./runtime')
 const sortJson = runtime.sortJson
 
@@ -1143,7 +1143,7 @@ const build = async ({ config, target, template, errorHandler = defaultErrorHand
       return template
     };
     stabilizeOutput(accumulators)
-    runtime.fs.writeFileSync(instanceName, JSON.stringify(Object.assign({ queries: template.queries }, accumulators), 0, 2))
+    runtime.fs.writeFileSync(instanceName, JSON.stringify(Object.assign({ queries: template.queries.map(updateQueries) }, accumulators), 0, 2))
 
     // km tests file
     const testsName = `./${target}.test.json`

package/package.json

@@ -62,6 +62,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.4-beta.4",
+  "version": "7.5.4-beta.5",
   "license": "ISC"
 }

package/src/config.js

@@ -5,7 +5,6 @@ const { Generators } = require('./generators')
 const client = require('../client')
 const Digraph = require('./digraph')
 const helpers = require('./helpers')
-const deepEqual = require('deep-equal')
 const runtime = require('../runtime')
 const _ = require('lodash')
 
@@ -646,12 +645,13 @@ class Config {
     }
     const instanceFragments = (instance.fragments || []).map((fragment) => fragment.key || fragment.query).map( toCanonical )
     const templateFragments = (template.fragments || []).concat(this.dynamicFragments).map( toCanonical )
-    const sameFragments = deepEqual(templateFragments, instanceFragments)
-    const sameQueries = deepEqual((template.queries || []), (instance.queries || []))
+    const sameFragments = helpers.safeEquals(templateFragments, instanceFragments)
+    const sameQueries = helpers.safeEquals((template.queries || []).map(helpers.updateQueries), (instance.queries || []))
     return !(instance && sameQueries && sameFragments)
   }
 
   load (template, instance, options = { rebuild: false } ) {
+    this.template = template
     this.logs.push(`loading template for ${this.name}`)
     if (instance && instance.associations && !options.rebuild) {
       this.addAssociations(instance.associations)
@@ -713,7 +713,7 @@ class Config {
       }
     }
     if (global.entodictonDebugAssociation) {
-      if (deepEqual(global.entodictonDebugAssociation, association)) {
+      if (helpers.safeEquals(global.entodictonDebugAssociation, association)) {
         debugger; // debug association hit
       }
     }
@@ -748,7 +748,7 @@ class Config {
       throw `addHierarchy expected parent property to be a string. got ${JSON.stringify(parent)}`
     }
     if (global.entodictonDebugHierarchy) {
-      if (deepEqual(global.entodictonDebugHierarchy, [child, parent])) {
+      if ((helpers.safeEquals.entodictonDebugHierarchy, [child, parent])) {
         debugger; // debug hierarchy hit
       }
     }
@@ -766,7 +766,7 @@ class Config {
     }
 
     if (global.entodictonDebugHierarchy) {
-      if (deepEqual(global.entodictonDebugHierarchy, [child, parent])) {
+      if (helpers.safeEquals(global.entodictonDebugHierarchy, [child, parent])) {
         debugger; // debug hierarchy hit
       }
     }

package/src/helpers.js

@@ -44,10 +44,23 @@ const appendNoDups = (l1, l2) => {
 }
 
 const safeEquals = (v1, v2) => {
-  if (!deepEqual(stringify(v1), stringify(v2))) {
+  if (typeof v1 !== typeof v2) {
     return false
   }
-  return true
+
+  const type = typeof v1
+  if (type == 'number' || type == 'string') {
+    return v1 == v2
+  } else if (type == 'function') {
+    return v1.toString() == v2.toString()
+  } else {
+    for (let key in v1) {
+      if (!safeEquals(v1[key], v2[key])) {
+        return false
+      }
+    }
+    return true
+  }
 }
 
 /*
@@ -238,7 +251,66 @@ const mapInPlace = (list, fn) => {
   }
 }
 
+const updateQueries = (queryOrConfig) => {
+  if (typeof queryOrConfig == 'string' || queryOrConfig.query) {
+    return queryOrConfig
+  } else {
+    const config = queryOrConfig
+    return functionsToStrings(config)
+  }
+}
+
+const functionsToStrings = (config) => {
+  config = {...config}
+  const mapGenerator = (generator) => {
+      if (generator.apply) {
+        return { ...generator, match: generator.match.toString(), apply: generator.apply.toString() }
+      } else {
+        return [ generator[0].toString(), generator[1].toString() ]
+      }
+    }
+  if (config.generators) {
+    config.generators = config.generators.map( mapGenerator )
+  }
+  if (config.semantics) {
+    config.semantics = config.semantics.map( (semantic) => {
+      if (semantic.apply) {
+        return { ...semantic, match: semantic.match.toString(), apply: semantic.apply.toString() }
+      } else {
+        return [ semantic[0].toString(), semantic[1].toString() ]
+      }
+    })
+  }
+  if (config.bridges) {
+    config.bridges = config.bridges.map( (bridge) => {
+      bridge = {...bridge}
+      if (bridge.generator) {
+        bridge.generator = bridge.generator.toString()
+      }
+      if (bridge.generators) {
+        bridge.generators = bridge.generators.map( mapGenerator )
+      }
+      if (bridge.generatorp) {
+        bridge.generatorp = bridge.generatorp.toString()
+      }
+      if (bridge.generatorr) {
+        bridge.generatorr = bridge.generatorr.toString()
+      }
+      if (bridge.semantic) {
+        bridge.semantic = bridge.semantic.toString()
+      }
+      if (bridge.evaluator) {
+        bridge.evaluator = bridge.evaluator.toString()
+      }
+      return bridge
+    })
+  }
+  return config
+}
+
 module.exports = { 
+  functionsToStrings,
+  updateQueries,
   mapInPlace,
   validProps, 
   args,