theprogrammablemind_4wp 8.0.0-beta.1 → 8.0.0-beta.11

package/client.js

@@ -1663,7 +1663,7 @@ const knowledgeModuleImpl = async ({
           throw new Error('Error for the checkForLoop argument. Expected a JSON array of operator keys of the form "[<id>, <level>]"')
         }
       } catch (e) {
-        throw new Error(`Error parsing JSON of the checkForLoop argument. ${e}`)
+        throw new Error('Error for the checkForLoop argument. Expected a JSON array of operator keys of the form "[<id>, <level>]"')
       }
     } else {
       if (process.argv.includes('--checkForLoop') || process.argv.includes('-cl')) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "devDependencies": {
-    "eslint-plugin-import": "^2.23.4",
-    "jest": "^29.7.0",
-    "@typescript-eslint/parser": "^4.28.4",
     "@typescript-eslint/eslint-plugin": "^4.28.4",
-    "eslint-plugin-node": "^11.1.0",
+    "@typescript-eslint/parser": "^4.28.4",
+    "eslint": "^7.31.0",
     "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",
-    "eslint": "^7.31.0"
+    "jest": "^29.7.0"
   },
   "scripts": {
     "to:debug": "node inspect node_modules/.bin/jest --runInBand -t NEO23",
@@ -52,19 +52,18 @@
   ],
   "author": "dev@thinktelligence.com",
   "dependencies": {
+    "base-64": "^1.0.0",
     "deep-equal": "^2.0.4",
-    "uuid": "^8.3.2",
+    "fs": "0.0.1-security",
     "json-diff": "^1.0.3",
+    "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.20",
-    "fs": "0.0.1-security",
-    "base-64": "^1.0.0",
-    "sort-json": "^2.0.0",
+    "node-fetch": "^2.6.1",
     "readline": "^1.3.0",
     "scriptjs": "^2.5.9",
-    "underscore": "^1.13.1",
-    "json-stable-stringify": "^1.0.1",
-    "node-fetch": "^2.6.1"
+    "sort-json": "^2.0.0",
+    "uuid": "^8.3.2"
   },
-  "version": "8.0.0-beta.1",
+  "version": "8.0.0-beta.11",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -262,7 +262,12 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
       }
       if (bridge.children) {
         for (const child of bridge.children) {
-          config.addHierarchy(child, bridge.id)
+          // config.addHierarchy(child, bridge.id)
+          if (child.child) {
+            config.addHierarchy(child.child, bridge.id, child.instance)
+          } else {
+            config.addHierarchy(child, bridge.id)
+          }
         }
       }
       if (bridge.operator) {
@@ -270,12 +275,20 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
       }
       if (bridge.parents) {
         for (const parent of bridge.parents) {
-          config.addHierarchy(bridge.id, parent)
+          if (parent.parent) {
+            config.addHierarchy(bridge.id, parent.parent, parent.instance)
+          } else {
+            config.addHierarchy(bridge.id, parent)
+          }
         }
       }
       if (bridge.isA) {
         for (const parent of bridge.isA) {
-          config.addHierarchy(bridge.id, parent)
+          if (parent.parent) {
+            config.addHierarchy(bridge.id, parent.parent, parent.instance)
+          } else {
+            config.addHierarchy(bridge.id, parent)
+          }
         }
       }
       if (bridge.before) {
@@ -1309,9 +1322,9 @@ class Config {
     }
   }
 
-  addHierarchy (child, parent) {
+  addHierarchy (child, parent, instance) {
     if (child && parent || !child || Array.isArray(child) || (typeof child === 'string' && !parent)) {
-      this.addHierarchyChildParent(child, parent)
+      this.addHierarchyChildParent(child, parent, instance)
       // this.addHierarchyProperties ({ child, parent })
     } else {
       this.addHierarchyProperties(child)
@@ -1319,26 +1332,32 @@ class Config {
   }
 
   addHierarchyProperties (edge) {
-    const { child, parent } = edge
+    const { child, parent, instance } = edge
     if (typeof child !== 'string') {
       throw new Error(`addHierarchy expected child property to be a string. got ${JSON.stringify(child)}`)
     }
     if (typeof parent !== 'string') {
       throw new Error(`addHierarchy expected parent property to be a string. got ${JSON.stringify(parent)}`)
     }
+    if (instance && typeof instance !== 'boolean') {
+      throw new Error(`addHierarchy expected instance property to be a boolean or undefined. got ${JSON.stringify(instance)}`)
+    }
     debugHierarchy([child, parent])
     this.config.hierarchy.push(edge)
     // TODO greg11 this.hierarchy.addEdge(edge)
-    this._delta.json.hierarchy.push([child, parent])
+    this._delta.json.hierarchy.push([child, parent, instance || false])
   }
 
-  addHierarchyChildParent (child, parent) {
+  addHierarchyChildParent (child, parent, instance) {
     if (typeof child !== 'string') {
       throw new Error(`addHierarchy expected child to be a string. got ${JSON.stringify(child)}`)
     }
     if (typeof parent !== 'string') {
       throw new Error(`addHierarchy expected parent to be a string. got ${JSON.stringify(parent)}`)
     }
+    if (instance && typeof instance !== 'boolean') {
+      throw new Error(`addHierarchy expected instance property to be a boolean or undefined. got ${JSON.stringify(instance)}`)
+    }
     debugHierarchy([child, parent])
     if (this.config.hierarchy.find((element) => {
       const hc = hierarchyCanonical(element)
@@ -1349,9 +1368,9 @@ class Config {
       return
     }
 
-    this.config.hierarchy.push([child, parent])
+    this.config.hierarchy.push([child, parent, instance || false])
     // this.hierarchy.addEdge([child, parent])
-    this._delta.json.hierarchy.push([child, parent])
+    this._delta.json.hierarchy.push([child, parent, instance || false])
   }
 
   getBridge (id, level) {
@@ -1620,6 +1639,10 @@ class Config {
     return client.process(this, query, options)
   }
 
+  query (query, options) {
+    return this.process(query, options)
+  }
+
   processQuery (query, options) {
     return this.process(query, options)
   }