theprogrammablemind_4wp 7.5.4-beta.4 → 7.5.4-beta.6

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
 
@@ -518,7 +518,7 @@ const processInstance = (config, instance) => {
   for (const results of (instance.resultss || [])) {
     if (results.extraConfig) {
       // config.addInternal(results, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false)
-      config.addInternal(results)
+      config.addInternal(results, { handleCalculatedProps: true } )
     } else {
       processContextsB({ config, hierarchy, json: results/*, generators, semantics */ })
     }
@@ -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.6",
   "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')
 
@@ -104,6 +103,24 @@ const handleBridgeProps = (config, bridge) => {
   }
 }
 
+const handleCalculatedProps = (baseConfig, moreConfig) => {
+  for (let bridge of moreConfig.bridges) {
+    const valid = [ 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
+                    'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy' ]
+    helpers.validProps(valid, bridge, 'bridge')
+    handleBridgeProps(baseConfig, bridge)
+  }
+  if (moreConfig.operators) {
+    moreConfig.operators = moreConfig.operators.map((operator) => {
+      if (typeof operator === 'string') {
+        return { pattern: operator }
+      } else {
+        return operator
+      }
+    })
+  }
+}
+
 if (runtime.process.env.DEBUG_HIERARCHY) {
   global.entodictonDebugHierarchy = JSON.parse(runtime.process.env.DEBUG_HIERARCHY)
 }
@@ -646,12 +663,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 +731,7 @@ class Config {
       }
     }
     if (global.entodictonDebugAssociation) {
-      if (deepEqual(global.entodictonDebugAssociation, association)) {
+      if (helpers.safeEquals(global.entodictonDebugAssociation, association)) {
         debugger; // debug association hit
       }
     }
@@ -748,7 +766,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 +784,7 @@ class Config {
     }
 
     if (global.entodictonDebugHierarchy) {
-      if (deepEqual(global.entodictonDebugHierarchy, [child, parent])) {
+      if (helpers.safeEquals(global.entodictonDebugHierarchy, [child, parent])) {
         debugger; // debug hierarchy hit
       }
     }
@@ -1244,133 +1262,12 @@ class Config {
     if (config) {
       config = _.cloneDeep(config)
       this.config = config
-      for (let bridge of this.config.bridges) {
-        const valid = [ 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
-                        'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy' ]
-        helpers.validProps(valid, bridge, 'bridge')
-        /* moved
-        if (!bridge.bridge) {
-          bridge.bridge = "{ ...next(operator) }"
-        }
-        */
-        handleBridgeProps(this, bridge)
-
-        /* moved
-        if (!bridge.level) {
-          bridge.level = 0
-        }
-        */
-        /*
-        if (bridge.generator) {
-          this.config.generators.push({ 
-            match: ({context}) => bridge.id == context.marker,
-            apply: (args) => bridge.generator(args),
-          })
-        }
-        */
-        /* moved 
-        if (bridge.children) {
-          for (let child of bridge.children) {
-            this.addHierarchy(child, bridge.id)
-          }
-        }
-        if (bridge.parents) {
-          for (let parent of bridge.parents) {
-            this.addHierarchy(bridge.id, parent)
-          }
-        }
-        if (bridge.isA) {
-          for (let parent of bridge.isA) {
-            this.addHierarchy(bridge.id, parent)
-          }
-        }
-        */
-        /* moved
-        if (bridge.before) {
-          for (let after of bridge.before) {
-            if (typeof after == 'string') {
-              after = [after, 0]
-            }
-            this.addPriorities([after, [bridge.id, bridge.level]])
-          }
-        }
-        if (bridge.words) {
-          for (let def of bridge.words) {
-            if (typeof def == 'string') {
-              this.addWordInternal(def, {"id": bridge.id, "initial": `{ value: "${def}"}` })
-            } else {
-              const word = def.word
-              def = { initial: JSON.stringify(def), id: bridge.id, word: undefined }
-              this.addWordInternal(word, def)
-            }
-          }
-        }
-        if (bridge.generator) {
-          this.config.generators.unshift(bridge.generator)
-        }
-        */
-        /* moved
-        if (bridge.generators) {
-          const generators = [...bridge.generators]
-          generators.reverse()
-          for (let generator of generators) {
-            this.config.generators.unshift(generator)
-          }
-        }
-        if (bridge.generatorp) {
-          this.config.generators.unshift({ 
-            where: bridge.generatorp.where || client.where(3),
-            match: ({context}) => bridge.id == context.marker && context.paraphrase,
-            apply: (args) => bridge.generatorp(args),
-          })
-        }
-        if (bridge.generatorr) {
-          this.config.generators.unshift({ 
-            // TODO merge response and isResponse
-            where: bridge.generatorr.where || client.where(3),
-            match: ({context}) => bridge.id == context.marker && !context.paraphrase && (context.response || context.isResponse),
-            apply: (args) => bridge.generatorr(args),
-          })
-        }
-        if (bridge.evaluator) {
-          this.config.semantics.unshift({ 
-            where: bridge.evaluator.where || client.where(3),
-            match: ({context}) => bridge.id == context.marker && context.evaluate,
-            apply: (args) => bridge.evaluator(args),
-          })
-        }
-        if (bridge.semantic) {
-          this.config.semantics.unshift({ 
-            where: bridge.semantic.where || client.where(3),
-            match: ({context}) => bridge.id == context.marker,
-            apply: (args) => bridge.semantic(args),
-          })
-        }
-        */
-      }
-      if (config.operators) {
-        config.operators = config.operators.map((operator) => {
-          if (typeof operator === 'string') {
-            return { pattern: operator }
-          } else {
-            return operator
-          }
-        })
-      }
+      handleCalculatedProps(this, config)
     }
     this.hierarchy = new Digraph(this.config.hierarchy)
     this.initConfig = _.cloneDeep(this.config)
     this.configs.push(new KM({ config: this.config, getCounter: (name) => this.config.getCounter(name), uuid: this._uuid }))
 
-    /*
-    if (config) {
-      this.configs.push(new KM({config, isSelf: true}))
-      this.addInternal(Object.assign({}, config), false)
-    } else {
-      this.configs.push( new KM({config: this.config, isSelf: true}) )
-    }
-    */
-
     this.setUUIDs()
     this.initDefaults()
     if (!this.config.objects.namespaced) {
@@ -2026,7 +1923,6 @@ class Config {
         } else {
           addInternals.unshift(config)
         }
-        // this.addInternal(config, true, false, false, true)
       } else {
         if (interleaved) {
           addInternals.unshift(null)
@@ -2049,7 +1945,7 @@ class Config {
     if (!interleaved) {
       for (const config of addInternals) {
         if (!reverseIt) {
-          this.addInternal(config, true, false, false, true)
+          this.addInternal(config, { includeNamespace: false, allowNameToBeNull: true })
         } else {
           this.addInternalR(config, true, false, false, true)
         }
@@ -2201,7 +2097,7 @@ class Config {
 
       this.applyNamespace(configPrime, km.namespace, km.uuid)
       first = false
-      this.addInternal(configPrime, false, true)
+      this.addInternal(configPrime, { useOldVersion: false, skipObjects: true })
       applyUUID(configPrime, km.uuid)
     })
 
@@ -2491,7 +2387,7 @@ class Config {
   }
 
   // TODO get rid of useOldVersion arg
-  addInternal (more, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false) {
+  addInternal (more, { useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false, handleCalculatedProps : hcps = false } = {}) {
     if (more instanceof Config) {
       more.initialize({ force: false })
       if (useOldVersion) {
@@ -2501,6 +2397,10 @@ class Config {
         more = _.cloneDeep(more.initConfig)
       }
     }
+    if (hcps) {
+      handleCalculatedProps(this, more)
+      applyUUID(more, this._uuid)
+    }
     for (const key of Object.keys(more)) {
       const value = more[key]
       // TODO remove name and description on the config bag

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,