theprogrammablemind 7.5.0-beta.1 → 7.5.0-beta.3

package/package.json

@@ -61,6 +61,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.0-beta.1",
+  "version": "7.5.0-beta.3",
   "license": "ISC"
 }

package/src/config.js

@@ -412,11 +412,11 @@ class Config {
   }
 
   getSemantics (logs = []) {
-    return new Semantics(this.config.semantics || [], logs, { km: this.name })
+    return new Semantics(this.config.semantics, logs, { km: this.name })
   }
 
   getGenerators (logs = []) {
-    return new Generators(this.config.generators || [], logs, { km: this.name })
+    return new Generators(this.config.generators, logs, { km: this.name })
   }
 
   warningNotEvaluated (log, value) {
@@ -593,18 +593,21 @@ class Config {
     }
   }
 
-  addHierarchyProperties (properties) {
-    if (typeof properties.child !== 'string') {
+  addHierarchyProperties (edge) {
+    const { child, parent } = edge
+    if (typeof child !== 'string') {
       throw `addHierarchy expected child property to be a string. got ${JSON.stringify(child)}`
     }
-    if (typeof properties.parent !== 'string') {
-      throw `addHierarchy expected parent properties to be a string. got ${JSON.stringify(parent)}`
+    if (typeof parent !== 'string') {
+      throw `addHierarchy expected parent property to be a string. got ${JSON.stringify(parent)}`
     }
-    if (!this.config.hierarchy) {
-      this.config.hierarchy = []
+    if (global.entodictonDebugHierarchy) {
+      if (deepEqual(global.entodictonDebugHierarchy, [child, parent])) {
+        debugger; // debug hierarchy hit
+      }
     }
-    // this.config.hierarchy.push([properties.child, properties.parent])
-    this.config.hierarchy.push(properties)
+    this.config.hierarchy.push(edge)
+    // TODO greg11 this.hierarchy.addEdge(edge)
     this._delta.json.hierarchy.push([child, parent])
   }
 
@@ -615,14 +618,13 @@ class Config {
     if (typeof parent !== 'string') {
       throw `addHierarchy expected parent to be a string. got ${JSON.stringify(parent)}`
     }
-    if (!this.config.hierarchy) {
-      this.config.hierarchy = []
-    }
+
     if (global.entodictonDebugHierarchy) {
       if (deepEqual(global.entodictonDebugHierarchy, [child, parent])) {
         debugger; // debug hierarchy hit
       }
     }
+
     if (this.config.hierarchy.find( (element) => {
       const hc = hierarchyCanonical(element) 
       if (child == hc.child && parent == hc.parent) {
@@ -633,6 +635,7 @@ class Config {
     }
 
     this.config.hierarchy.push([child, parent])
+    // this.hierarchy.addEdge([child, parent])
     this._delta.json.hierarchy.push([child, parent])
   }
 
@@ -953,17 +956,11 @@ class Config {
     if (!config) {
       return
     }
-    config.operators = config.operators || []
-    config.bridges = config.bridges || []
-    config.words = config.words || {}
-    config.generators = config.generators || []
-    config.semantics = config.semantics || []
-
     config.operators = config.operators.filter( (element) => !element.development )
     config.bridges = config.bridges.filter( (element) => !element.development )
     config.generators = config.generators.filter( (element) => !element.development )
     config.semantics = config.semantics.filter( (element) => !element.development )
-    config.hierarchy = (config.hierarchy || []).filter( (element) => !element.development )
+    config.hierarchy = (config.hierarchy).filter( (element) => !element.development )
     for (const word in config.words) {
       const defs = config.words[word] || []
       config.words[word] = defs.filter( (def) => !def.development )
@@ -1006,6 +1003,15 @@ class Config {
         'flatten',
       ]
       helpers.validProps(valid, config, 'config')
+
+      config.operators = config.operators || []
+      config.bridges = config.bridges || []
+      config.words = config.words || {}
+      config.generators = config.generators || []
+      config.semantics = config.semantics || []
+      config.hierarchy = config.hierarchy || []
+      config.associations = config.associations || { negative: [], positive: [] }
+      config.priorities = config.priorities || []
     }
 
     this.allowDelta = false
@@ -1083,16 +1089,7 @@ class Config {
     if (config) {
       config = _.cloneDeep(config)
       this.config = config
-      if (!this.config.generators) {
-        this.config.generators = []
-      }
-      if (!this.config.semantics) {
-        this.config.semantics = []
-      }
-      if (!this.config.words) {
-        // this.config.words = {}
-      }
-      for (let bridge of (this.config.bridges || [])) {
+      for (let bridge of this.config.bridges) {
         const valid = [ 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generators', 'id', 'inverted', 'isA',
                         'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy' ]
         helpers.validProps(valid, bridge, 'bridge')
@@ -1178,6 +1175,7 @@ class 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 }))
 
@@ -1432,7 +1430,7 @@ class Config {
     this.config.bridges && this.config.bridges.forEach((bridge) => { bridge.uuid = this._uuid })
     this.config.words && setWordsUUIDs(this.config.words, this._uuid)
     this.config.operators && this.config.operators.forEach((operator) => { operator.uuid = this._uuid })
-    const ids = Array.from(new Set((this.config.bridges && this.config.bridges.map((bridge) => bridge.id)) || []))
+    const ids = Array.from(new Set(this.config.bridges.map((bridge) => bridge.id)))
     ids.sort()
     this.config.namespaces = {}
     // if (true || ids.length > 0) {
@@ -1648,6 +1646,13 @@ class Config {
       return false
     }
 
+    /* TODO greg11
+    if (!this.hierarchy) {
+      debugBreak()
+      return false
+    }
+    */
+
     for (const key in this.config.words) {
       const values = this.config.words[key]
       if (values.some((word) => (Object.keys(word).includes('uuid') && !word.uuid))) {
@@ -1657,7 +1662,7 @@ class Config {
     }
 
     const kmsUuids = this.configs.map((km) => km.uuid)
-    const bridgesUuids = (this.config.bridges && this.config.bridges.map((bridge) => bridge.uuid).filter((uuid) => uuid)) || []
+    const bridgesUuids = this.config.bridges.map((bridge) => bridge.uuid).filter((uuid) => uuid)
     let result = true
     bridgesUuids.forEach((buuid) => {
       if (!kmsUuids.includes(buuid)) {
@@ -1727,6 +1732,7 @@ class Config {
     this.resetDelta()
     const debug = this.config.debug;
     this.config = _.cloneDeep(this.initConfig)
+    this.hierarchy = new Digraph(this.config.hierarchy)
     if (debug) {
       this.config.debug = debug
     }
@@ -1786,8 +1792,8 @@ class Config {
       config.wasInitialized = false
       // TODO change name of config: to baseConfig:
       const kmFn = (name) => this.getConfig(name)
-      const hierarchy = new Digraph((config.config || {}).hierarchy || [])
-      const args = { isModule, addWord: aw, km: kmFn, hierarchy, config, baseConfig: this, currentConfig: config, uuid: config._uuid, objects: namespacedObjects, namespace, api: config.api }
+      // const hierarchy = new Digraph((config.config || {}).hierarchy)
+      const args = { isModule, addWord: aw, km: kmFn, hierarchy: this.hierarchy, config, baseConfig: this, currentConfig: config, uuid: config._uuid, objects: namespacedObjects, namespace, api: config.api }
       config.initializerFn(args)
       if (config.initAfterApi) {
         initAfterApis.push({ config, args })
@@ -1984,8 +1990,7 @@ class Config {
     }
 
     if (config.hierarchy) {
-      let hierarchy = config.hierarchy
-      hierarchy = hierarchy.map((h) => {
+      helpers.mapInPlace(config.hierarchy, (h) => {
         if (Array.isArray(h)) {
           return h.map((id) => toNS(id))
         } else {
@@ -1994,7 +1999,6 @@ class Config {
           return Object.assign({}, h, { child: toNS(h.child), parent: toNS(h.parent) })
         }
       })
-      config.hierarchy = hierarchy
     }
 
     if (config.priorities) {

package/src/helpers.js

@@ -232,7 +232,14 @@ const validProps = (valids, object, type) => {
   }
 }
 
+const mapInPlace = (list, fn) => {
+  for (let i = 0; i < list.length; ++i) {
+    list[i] =fn(list[i])
+  }
+}
+
 module.exports = { 
+  mapInPlace,
   validProps, 
   args, 
   safeEquals,