theprogrammablemind 8.0.0-beta.2 → 8.0.0-beta.20

package/client.js

@@ -865,6 +865,10 @@ const getConfigForTest = (config, testConfig) => {
 
 const runTest = async (config, expected, { args, verbose, testConfig, debug }) => {
   const test = expected.query
+  if (args.query && args.query != test) {
+    // no run this
+    return
+  }
   // initialize in between test so state is not preserved since the test was adding without state
   config.rebuild()
   const errorHandler = (error) => {
@@ -1582,7 +1586,7 @@ const knowledgeModuleImpl = async ({
     parser.add_argument('-t', '--test', { action: 'store_true', help: 'Run the tests. Create tests by running with the --query + --save flag' })
     parser.add_argument('-tv', '--testVerbose', { action: 'store_true', help: 'Run the tests in verbose mode. Create tests by running with the --query or --loop with the --save flag' })
     // parser.add_argument('-ttr', '--testToRun', { help: 'Only the specified test will be run' })
-    parser.add_argument('-tva', '--testAllVerbose', { action: 'store_true', help: 'Run the tests in verbose mode. All the tests will be run instead of stopping at first failure. Create tests by running with the --query or --loop with the --save flag' })
+    parser.add_argument('-tva', '--testAllVerbose', { action: 'store_true', help: 'Run the tests in verbose mode. All the tests will be run instead of stopping at first failure. Create tests by running with the --query or --loop with the --save flag. if -q is specified the tests will be run for just the specified query.' })
     parser.add_argument('-tnp', '--testNoParenthesized', { action: 'store_true', help: 'Don\' check parenthesized differences for the tests' })
     parser.add_argument('-n', '--count', { help: 'Number of times to run the tests. Default is one. Use this to check for flakey test. If possible the system will print out a message with the word "hint" suggesting how to fix the problem' })
     // parser.add_argument('-b', '--build', { help: 'Specify the template file name of the form <kmName>. There should be a file called <baseKmName>.<kmName>.template.json with the queries to run. For example { queries: [...] }. The template file will be run and generate an instantiation called <baseKmName>.<kmName>.instance.json and a file called <kmName>.js that will load the template file (this is file generated only if not already existing) and a test file called <KmName>.tests.json. This can then be loaded into an instance of the current knowledge module to setup initial conditions.' })
@@ -1663,7 +1667,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')) {
@@ -1994,7 +1998,7 @@ const knowledgeModuleImpl = async ({
                     lines.setElement(2, 2, JSON.stringify(result.actual.checked, null, 2))
                     lines.log()
                     if (args.vimdiff) {
-                      vimdiff(result.actual.checked, result.expected.checked)
+                      show('checked properties for objects', result.expected.checked, result.actual.checked)
                     }
                     newError = true
                     headerShown = true
@@ -2012,7 +2016,7 @@ const knowledgeModuleImpl = async ({
                     lines.setElement(2, 2, JSON.stringify(result.actual.checkedContexts, null, 2))
                     lines.log()
                     if (args.vimdiff) {
-                      vimdiff(result.actual.checkedContexts, result.expected.checkedContexts)
+                      show('checked properties for context', result.expected.checkedContexts, result.actual.checkedContexts)
                     }
                     newError = true
                     headerShown = true

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.2",
+  "version": "8.0.0-beta.20",
   "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) {
@@ -1197,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) }
@@ -1309,9 +1324,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 +1334,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 +1370,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 +1641,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)
   }
@@ -1797,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)
@@ -1863,6 +1870,7 @@ class Config {
     }
     this.get('objects').namespaced[this._uuid] = {}
     this.valid()
+    this.checks()
     debugConfigProps(this.config)
   }
 
@@ -2608,7 +2616,7 @@ class Config {
 
     this.hierarchy.edges = this.config.hierarchy
     this.valid()
-    this.checkBridges()
+    this.checks()
   }
 
   nameToUUID (name) {
@@ -2822,6 +2830,11 @@ class Config {
     }
   }
 
+  checks () {
+    this.checkOperators()
+    this.checkBridges()
+  }
+
   checkOperators () {
     if (!this.config.operators) {
       return
@@ -2842,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}`)
     }
   };