theprogrammablemind_4wp 8.0.0-beta.19 → 8.0.0-beta.20

package/package.json

@@ -64,6 +64,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "8.0.0-beta.19",
+  "version": "8.0.0-beta.20",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -1210,7 +1210,9 @@ class Config {
         // console.log("instanceFragments", instanceFragments)
       }
     }
-    if (startOfChanges || instance.resultss) {
+    if (startOfChanges) {
+      return { needsRebuild: true, startOfChanges, previousResultss: instance.resultss }
+    } else if (startOfChanges || instance.resultss) {
       return { needsRebuild: !(instance && sameQueries && sameFragments), startOfChanges, previousResultss: instance.resultss }
     } else {
       return { needsRebuild: !(instance && sameQueries && sameFragments) }
@@ -1820,24 +1822,6 @@ class Config {
     // when running configs any bridges added are marked as transitory so that the associated will ignore those op's
     this.transitoryMode = false
 
-    // check for duplicate bridges
-    if (config && config.bridges) {
-      let duplicated = new Set()
-      const seen = new Set()
-      for (const bridge of config.bridges) {
-        const id = `${bridge.id}/${bridge.level}`
-        if (seen.has(id)) {
-          duplicated.add(id)
-        } else {
-          seen.add(id)
-        }
-      }
-      duplicated = Array.from(duplicated)
-      if (duplicated.length > 0) {
-        throw new Error(`In the KM ${config.name}, the following operators are duplicated in the bridges: ${duplicated}`)
-      }
-    }
-
     if (config && config.words) {
       initWords(config.words)
       isValidWordDef(config.words)
@@ -1886,6 +1870,7 @@ class Config {
     }
     this.get('objects').namespaced[this._uuid] = {}
     this.valid()
+    this.checks()
     debugConfigProps(this.config)
   }
 
@@ -2631,7 +2616,7 @@ class Config {
 
     this.hierarchy.edges = this.config.hierarchy
     this.valid()
-    this.checkBridges()
+    this.checks()
   }
 
   nameToUUID (name) {
@@ -2845,6 +2830,11 @@ class Config {
     }
   }
 
+  checks () {
+    this.checkOperators()
+    this.checkBridges()
+  }
+
   checkOperators () {
     if (!this.config.operators) {
       return
@@ -2865,53 +2855,19 @@ class Config {
       return
     }
 
-    /*
-      "namespaces": {
-        "634a678b-8d92-4464-bf65-943a82f404d8": {
-          "ids": [ "tankConcept" ],
-          "namespace": [ "ns1" ]
-        },
-       console.log('before check', JSON.stringify(this._eqClasses, null, 2))
-    */
-
-    const errors = []
-    /*
-    const namespaces = this.config.namespaces
-    const nsToIds = {}
-    for (const uuid in namespaces) {
-      const namespace = namespaces[uuid].namespace
-      const ns = namespace.join('#')
-      if (!nsToIds[ns]) {
-        nsToIds[ns] = new Set()
-      }
-      const ids = nsToIds[ns]
-      for (const id of namespaces[uuid].ids) {
-        if (ids.has(id)) {
-          if (ns === '') {
-            const dups = this.config.bridges.filter( (bridge) => bridge.id == id )
-            errors.push(`Id '${id}' is defined more than once in the bridges of the base namespace of the KM ${this.name}, Dups are ${JSON.stringify(dups)}`)
-          } else {
-            errors.push(`Id '${id}' is defined more than once in the bridges of the ${ns} namespace of the KM ${this.name}`)
-          }
-        } else {
-          ids.add(id)
-        }
-      }
-    }
-    */
-
-    const keyIsPresent = {}
+    let duplicated = new Set()
+    const seen = new Set()
     for (const bridge of this.config.bridges) {
-      const key = `${bridge.id}/${bridge.level} (namespace: ${bridge.uuid})`
-      if (keyIsPresent[key]) {
-        errors.push(new Error(`Id '${key}' is defined more than once in bridges of the base namespace of the KM ${this.name}`))
+      const id = `${bridge.id}/${bridge.level} (namespace: ${bridge.uuid || this.uuid})`
+      if (seen.has(id)) {
+        duplicated.add(id)
       } else {
-        keyIsPresent[key] = key
+        seen.add(id)
       }
     }
-
-    if (errors.length > 0) {
-      throw errors
+    duplicated = Array.from(duplicated)
+    if (duplicated.length > 0) {
+      throw new Error(`In the KM ${this.name}, the following operators are duplicated in the bridges: ${duplicated}`)
     }
   };