theprogrammablemind_4wp 9.3.0-beta.37 → 9.3.0-beta.39

package/package.json

@@ -69,6 +69,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.3.0-beta.37",
+  "version": "9.3.0-beta.39",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -3185,6 +3185,12 @@ class Config {
         more.generators.map( (g) => g.km = km )
       }
     }
+    const normalizeIsA = (edge) => {
+      if (edge.length == 3 || edge.parent || edge.child) {
+        return edge
+      }
+      return [...edge, false]
+    }
     for (const key of Object.keys(more)) {
       const value = more[key]
       // TODO remove name and description on the config bag
@@ -3228,9 +3234,9 @@ class Config {
           const hierarchy = this.config.words.hierarchy
           const moreHierarchy = more.words.hierarchy
           if (addFirst) {
-            this.config.words.hierarchy = moreHierarchy.concat(hierarchy)
+            this.config.words.hierarchy = moreHierarchy.concat(hierarchy.map(normalizeIsA))
           } else {
-            this.config.words.hierarchy = hierarchy.concat(moreHierarchy)
+            this.config.words.hierarchy = hierarchy.concat(moreHierarchy.map(normalizeIsA))
           }
         }
       } else if (key === 'name') {
@@ -3302,7 +3308,9 @@ class Config {
         // console.log('more', JSON.stringify(more, null, 2))
         // hierarchy must update in place and does not care about the list order
         if (key === 'hierarchy') {
-          this.config[key].push(...more[key])
+          const moreEdges = more[key].map(normalizeIsA)
+          this.config[key].push(...moreEdges)
+          this.hierarchy.addEdges(moreEdges)
         } else {
           if (addFirst) {
             this.config[key] = more[key].concat(this.config[key])

package/src/configHelpers.js

@@ -257,18 +257,18 @@ const setupProcessB = ({ config, initializer, allowDelta = false, rebuildingTemp
 const setupContexts = (rawContexts) => {
   let first = true
   const contexts = []
-  contexts.push({ marker: 'controlStart', controlRemove: true })
+  contexts.push({ marker: 'controlStart', controlRemove: true, isControl: true })
   let previous
   for (const context of rawContexts) {
     if (first) {
       first = false
     } else {
-      contexts.push({ marker: 'controlBetween', controlRemove: true, previous })
+      contexts.push({ marker: 'controlBetween', controlRemove: true, isControl: true, previous })
     }
     contexts.push(context)
     previous = context
   }
-  contexts.push({ marker: 'controlEnd', controlRemove: true, previous })
+  contexts.push({ marker: 'controlEnd', controlRemove: true, isControl: true, previous })
 
   let _index = 0
   const id = (context) => {
@@ -441,8 +441,8 @@ const loadInstance = async (config, instance) => {
   */
 
   // const { /* data, generators, semantics, */ hierarchy } = setupProcessB({ config })
-  const hierarchy = config.hierarchy
   for (const i in (instance.resultss || [])) {
+    const hierarchy = config.hierarchy
     const results = instance.resultss[i]
     if (results.extraConfig) {
       // config.addInternal(results, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false)

package/src/debug.js

@@ -31,12 +31,12 @@ const wasHit = (name) => {
   return hits[name]
 }
 
-const counter = (name, breakAt = [], debugBreak = true) => {
+const counter = (name, { breakAt=[], debugBreak=true, tag='' } = {}) => {
   if (!counters[name]) {
     counters[name] = 0
   }
   counters[name] += 1
-  console.log(`counters[${name}] = ${counters[name]}`)
+  console.log(`counters[${name}] = ${counters[name]} ${tag}`)
   unhit(name)
   if (Array.isArray(breakAt) && breakAt.includes(counters[name])) {
     if (debugBreak) {