theprogrammablemind_4wp 7.5.0-beta.33 → 7.5.0-beta.34

package/package.json

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

package/src/config.js

@@ -542,9 +542,23 @@ class Config {
       client.build({ config: this, target: this.name, beforeQuery: () => {}, template, ...options })
     } else {
       // no change
-      this.initInstances.push(instance)
-      this.instances.push(instance)
-      client.processInstance(this, instance)
+      // this.initInstances.push({ ...instance, name: config.name })
+      const isEmpty = ( instance ) => {
+        const properties = [
+          "queries",
+          "resultss",
+          "fragments",
+          "semantics",
+          "associations",
+        ]
+        return !properties.find( (property) => instance[property].length > 0 )
+      }
+      if (!isEmpty(instance)) {
+        instance.name = this.name
+        this.initInstances.push(instance)
+        this.instances.push(instance)
+        client.processInstance(this, instance)
+      }
     }
   }
 
@@ -1533,7 +1547,8 @@ class Config {
   }
 
   initializeFromConfigs () {
-    this.configs.forEach(({ config, namespace, uuid }) => {
+    // [...this.configs].reverse().forEach(({ config, namespace, uuid }) => {
+    [...this.configs].reverse().forEach(({ config, namespace, uuid }) => {
       /*
       let objects = this.get('objects')
       if (namespace) {
@@ -1785,8 +1800,17 @@ class Config {
       this.configs = [...oconfigs]
     }
 
+    const addInternals = []
     const inits = []
     const initAfterApis = []
+    if (false && this.config.hierarchy.find( (pair) => JSON.stringify(pair) === JSON.stringify(["equipable2","property"]))) {
+      debugger // happened
+    }
+    if (false && this.name == 'countable') {
+      debugger // in rebuild
+    }
+    const reverseIt = true
+    const interleaved = true
     this.configs.forEach((km) => {
       const namespace = km.namespace
       this.config.objects.namespaced[km._uuid] = {}
@@ -1819,7 +1843,12 @@ class Config {
       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 })
+        // reverse the list
+        initAfterApis.unshift({ config, args })
+      } else {
+        if (interleaved) {
+          initAfterApis.unshift(null)
+        }
       }
       // greg
       if (config._api) {
@@ -1827,27 +1856,124 @@ class Config {
           // reverse the list
           inits.unshift( () => config._api.initialize({ config: this, km: kmFn, api: config._api }) )
           // config._api.initialize({ config, api: config._api })
+        } else {
+          if (interleaved) {
+            inits.unshift(null)
+          }
         }
         config._api.objects = namespacedObjects
         config._api.config = () => this
         config._api.uuid = config._uuid
+      } else {
+        if (interleaved) {
+          inits.unshift(null)
+        }
       }
       config.setUUIDs()
       config.applyNamespace(config.config, namespace, config.uuid)
       if (!isSelf) {
-        this.addInternal(config, true, false, false, true)
+        if (!reverseIt) {
+          addInternals.push(config)
+        } else {
+          addInternals.unshift(config)
+        }
+        // this.addInternal(config, true, false, false, true)
+      } else {
+        if (interleaved) {
+          addInternals.unshift(null)
+        }
       }
       km.valid()
     })
-    // console.log('inits from config', inits)
-    for (const init of inits) {
-      init()
+
+    if (this.name == 'time') {
+      debugger
     }
-    for (let init of initAfterApis) {
-      // init.args.isAfterApi = true
-      init.config.initializerFn({ ...init.args, kms: this.getConfigs(), isAfterApi: true })
+
+    if (addInternals.length !== inits.length || addInternals.length !== initAfterApis.length) {
+      debugger // bug
+    }
+
+    const generators = this.config.generators
+    const semantics = this.config.semantics
+    if (reverseIt) {
+      this.config.generators = []
+      this.config.semantics = []
+    }
+
+    if (!interleaved) {
+      for (const config of addInternals) {
+        if (!reverseIt) {
+          this.addInternal(config, true, false, false, true)
+        } else {
+          this.addInternalR(config, true, false, false, true)
+        }
+      }
+      // console.log('inits from config', inits)
+      for (const init of inits) {
+        init()
+      }
+      for (let init of initAfterApis) {
+        // init.args.isAfterApi = true
+        init.config.initializerFn({ ...init.args, kms: this.getConfigs(), isAfterApi: true })
+      }
+      this.instances.forEach((instance) => client.processInstance(this, instance))
+    } else {
+      const base = {
+        operators: this.config.operators,
+        bridges: this.config.bridges,
+        hierarchy: this.config.hierarchy,
+        priorities: this.config.priorities,
+        associations: this.config.associations,
+        words: this.config.words
+      }
+
+      this.config.operators = []
+      this.config.bridges = []
+      this.config.hierarchy = []
+      this.config.priorities = []
+      this.config.associations = { positive: [], negative: [] }
+      this.config.words = {}
+
+      for (let i = 0; i < addInternals.length; ++i) {
+        let name;
+        if (addInternals[i]) {
+          this.addInternalR(addInternals[i], true, false, false, true)
+          name = addInternals[i].name
+        } else{
+          this.addInternalR(base, true, false, false, true)
+          name = this.name
+        }
+        // console.log('name -------------', name)
+        if (inits[i]) {
+          inits[i]()
+        }
+        if (initAfterApis[i]) {
+          const init = initAfterApis[i]
+          init.config.initializerFn({ ...init.args, kms: this.getConfigs(), isAfterApi: true })
+        }
+        if (this.name == 'pipboy') {
+          debugger
+        }
+        const instance = this.instances.find((instance) => instance.name == name)
+        if (instance) {
+          // console.log('-------- instance')
+          if (name == 'pipboyTemplate') {
+            debugger
+          }
+          client.processInstance(this, instance)
+        }
+      }
+      // this.instances.forEach((instance) => client.processInstance(this, instance))
+    }
+
+    if (reverseIt) {
+      this.config.generators = generators.concat(this.config.generators)
+      this.config.semantics = semantics.concat(this.config.semantics)
+    }
+    if (this.name == 'pipboy') {
+      debugger // instance
     }
-    this.instances.forEach((instance) => client.processInstance(this, instance))
     this.valid()
     this.checkBridges()
   }
@@ -2173,6 +2299,10 @@ class Config {
       more = new Config(more)
     }
 
+    if (this.name == 'pipboy') {
+      debugger // in add
+      // .config.hierarchy.find( (pair) => JSON.stringify(pair) == JSON.stringify(["equipable","isEder"]) )
+    }
     this.valid()
     more.valid()
     // copy so i don't have to copy later
@@ -2214,6 +2344,13 @@ class Config {
     this.configs.forEach((km) => {
       this.instances = (km._config.instances || this.initInstances.slice()).concat(this.instances)
     })
+    let noDups = []
+    for (let instance of this.instances) {
+      if (!noDups.find( (existing) => existing.name == instance.name )) {
+        noDups.push(instance)
+      }
+    }
+    this.instances = noDups
 
     this.rebuild()
     this.valid()
@@ -2331,6 +2468,128 @@ class Config {
     }
     return this
   }
+
+  // assumes this is called in reverse order
+  addInternalR (more, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false) {
+    if (more instanceof Config) {
+      more.initialize({ force: false })
+      if (useOldVersion) {
+        more = more.config
+      } else {
+        // more = more.initConfig
+        more = _.cloneDeep(more.initConfig)
+      }
+    }
+    for (const key of Object.keys(more)) {
+      const value = more[key]
+      // TODO remove name and description on the config bag
+      const noOverwrite = ['name', 'namespaced']
+      if (!this.config[key]) {
+        if (allowNameToBeNull) {
+          if (noOverwrite.includes(key)) {
+            continue
+          }
+        } else if (this.config[key] && noOverwrite.includes(key)) {
+          continue
+        }
+        this.config[key] = value
+        continue
+      }
+      if (key === 'words') {
+        const configWords = this.config.words
+        const moreWords = more.words
+        for (const word of Object.keys(moreWords)) {
+          if (!configWords[word]) {
+            configWords[word] = []
+          }
+          // configWords[word] = configWords[word].concat(moreWords[word])
+          configWords[word] = moreWords[word].concat(configWords[word])
+        }
+      } else if (key === 'name') {
+        /*
+        if (this.config[key] === '') {
+          this.config[key] = more[key]
+        }
+        */
+      } else if (key === 'namespaces') {
+        if (includeNamespaces) {
+          Object.assign(this.config[key], more[key])
+        }
+      } else if (key === 'debug') {
+        this.config[key] = this.config[key] || more[key]
+      } else if (key === 'description') {
+        // this.config[key] += ' ' + more[key].trim()
+        this.config[key] = more[key].trim() + ' ' + this.config[key]
+      } else if (key === 'objects') {
+        if (!skipObjects) {
+          // namespaced is special
+          const namespaced = this.config.objects.namespaced
+          Object.assign(this.config[key], more[key])
+          this.config.objects.namespaced = namespaced
+        }
+      } else if (key === 'associations') {
+        const configAssociations = this.config.associations
+        const moreAssociations = more.associations
+        if (moreAssociations.positive) {
+          // configAssociations.positive = configAssociations.positive.concat(moreAssociations.positive)
+          configAssociations.positive = moreAssociations.positive.concat(configAssociations.positive)
+        }
+        if (moreAssociations.negative) {
+          // configAssociations.negative = configAssociations.negative.concat(moreAssociations.negative)
+          configAssociations.negative = moreAssociations.negative.concat(configAssociations.negative)
+        }
+      } else if (Array.isArray(value)) {
+        // handle allowDups
+        if (key == 'operators') {
+          // TODO what about other props
+          const isDup = (op1, op2) => op1.pattern == op2.pattern
+          for (const newOne of more[key]) {
+            for (let iOldOne = 0; iOldOne < this.config[key].length; ++iOldOne) {
+              const oldOne = this.config[key][iOldOne];
+              if (isDup(newOne, oldOne)) {
+                if (oldOne.allowDups) {
+                  // the old one takes precedence to match what would happen during the original load
+                  debugger
+                  this.config[key].splice(iOldOne, 1)
+                  break;
+                }
+              }
+            }
+          }
+        }
+        if (key == 'bridges') {
+          // TODO what about other props
+          const idDup = (b1, b2) => b1.id == b2.id && b1.level == b2.level && b1.bridge == b2.bridge
+          for (const newOne of more[key]) {
+            for (let iOldOne = 0; iOldOne < this.config[key].length; ++iOldOne) {
+              const oldOne = this.config[key][iOldOne];
+              if (newOne.id == oldOne.id) {
+                if (oldOne.allowDups) {
+                  // the old one takes precedence to match what would happen during the original load
+                  this.config[key].splice(iOldOne, 1)
+                  break;
+                }
+              }
+            }
+          }
+        }
+        // console.log('key', key, 'XXX')
+        // console.log('more', JSON.stringify(more, null, 2))
+        // this.config[key] = this.config[key].concat(more[key])
+        if (key == '2enerators') {
+          debugger
+        }
+        // this.config[key] = this.config[key].concat(more[key])
+        this.config[key] = more[key].concat(this.config[key])
+      } else {
+        if (!(key in this.config)) {
+          throw `Unexpected property in config ${key}`
+        }
+        this.config[key] = more[key]
+      }
+    }
+    return this
+  }
 }
 
 module.exports = {