theprogrammablemind 7.5.4-beta.1 → 7.5.4-beta.3

package/package.json

@@ -10,12 +10,12 @@
     "eslint": "^7.31.0"
   },
   "scripts": {
-    "to:debug": "node inspect node_modules/.bin/jest --runInBand -t ONE23",
+    "to:debug": "node inspect node_modules/.bin/jest --runInBand -t NEO23",
     "test:debug": "node inspect node_modules/.bin/jest --runInBand --config ./jest.config.json",
-    "tod": "node inspect node_modules/.bin/jest --runInBand -t ONE23",
+    "tod": "node inspect node_modules/.bin/jest --runInBand -t NEO23",
     "lint:fix": "eslint \"**/*.js\" --fix",
     "lint": "eslint \"**/*.js\"",
-    "to": "node node_modules/.bin/jest --runInBand -t ONE23",
+    "to": "node node_modules/.bin/jest --runInBand -t NEO23",
     "test": "jest --config ./jest.config.json",
     "test:watch": "npm run test -- --watch"
   },
@@ -61,6 +61,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.4-beta.1",
+  "version": "7.5.4-beta.3",
   "license": "ISC"
 }

package/src/config.js

@@ -22,6 +22,88 @@ const indent = (string, indent) => {
     return string.replace(/^/gm, ' '.repeat(indent));
 }
 
+const handleBridgeProps = (config, bridge) => {
+  if (!bridge.bridge) {
+    bridge.bridge = "{ ...next(operator) }"
+  }
+  if (!bridge.level) {
+    bridge.level = 0
+  }
+  if (bridge.children) {
+    for (let child of bridge.children) {
+      config.addHierarchy(child, bridge.id)
+    }
+  }
+  if (bridge.parents) {
+    for (let parent of bridge.parents) {
+      config.addHierarchy(bridge.id, parent)
+    }
+  }
+  if (bridge.isA) {
+    for (let parent of bridge.isA) {
+      config.addHierarchy(bridge.id, parent)
+    }
+  }
+  if (bridge.before) {
+    for (let after of bridge.before) {
+      if (typeof after == 'string') {
+        after = [after, 0]
+      }
+      config.addPriorities([after, [bridge.id, bridge.level]])
+    }
+  }
+  if (bridge.words) {
+    for (let def of bridge.words) {
+      if (typeof def == 'string') {
+        config.addWordInternal(def, {"id": bridge.id, "initial": `{ value: "${def}"}` })
+      } else {
+        const word = def.word
+        def = { initial: JSON.stringify(def), id: bridge.id, word: undefined }
+        config.addWordInternal(word, def)
+      }
+    }
+  }
+  if (bridge.generator) {
+    config.config.generators.unshift(bridge.generator)
+  }
+  if (bridge.generators) {
+    const generators = [...bridge.generators]
+    generators.reverse()
+    for (let generator of generators) {
+      config.config.generators.unshift(generator)
+    }
+  }
+  if (bridge.generatorp) {
+    config.config.generators.unshift({ 
+      where: bridge.generatorp.where || client.where(3),
+      match: ({context}) => bridge.id == context.marker && context.paraphrase,
+      apply: (args) => bridge.generatorp(args),
+    })
+  }
+  if (bridge.generatorr) {
+    config.config.generators.unshift({ 
+      // TODO merge response and isResponse
+      where: bridge.generatorr.where || client.where(3),
+      match: ({context}) => bridge.id == context.marker && !context.paraphrase && (context.response || context.isResponse),
+      apply: (args) => bridge.generatorr(args),
+    })
+  }
+  if (bridge.evaluator) {
+    config.config.semantics.unshift({ 
+      where: bridge.evaluator.where || client.where(3),
+      match: ({context}) => bridge.id == context.marker && context.evaluate,
+      apply: (args) => bridge.evaluator(args),
+    })
+  }
+  if (bridge.semantic) {
+    config.config.semantics.unshift({ 
+      where: bridge.semantic.where || client.where(3),
+      match: ({context}) => bridge.id == context.marker,
+      apply: (args) => bridge.semantic(args),
+    })
+  }
+}
+
 if (runtime.process.env.DEBUG_HIERARCHY) {
   global.entodictonDebugHierarchy = JSON.parse(runtime.process.env.DEBUG_HIERARCHY)
 }
@@ -86,6 +168,17 @@ const normalizeConfig = (config) => {
           config[bag][i].km = config.name
         }
       }
+      
+    }
+    if (config['bridges']) {
+      for (let bridge of config['bridges']) {
+        if (!bridge.level) {
+          bridge.level = 0
+        }
+        if (!bridge.bridge) {
+          bridge.bridge = "{ ...next(operator) }"
+        }
+      }
     }
   }
 }
@@ -689,6 +782,7 @@ class Config {
     if (global.transitoryMode) {
       def.transitoryMode = true
     }
+    handleBridgeProps(this, def)
     bridges.push(def)
     this.checkBridges();
     this._delta.json.bridges.push({ action: 'add', bridge: def })
@@ -1018,7 +1112,8 @@ class Config {
         'debug',
 
         // TODO Fix these from the test app
-        'implicit',
+        'implicits',
+        'convolution',
         'expected_generated',
         'expected_results',
         'skipSemantics',
@@ -1115,9 +1210,21 @@ class Config {
       config = _.cloneDeep(config)
       this.config = config
       for (let bridge of this.config.bridges) {
-        const valid = [ 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generators', 'id', 'implicit', 'inverted', 'isA', 'children', 'parents',
+        const valid = [ 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
                         'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy' ]
         helpers.validProps(valid, bridge, 'bridge')
+        /* moved
+        if (!bridge.bridge) {
+          bridge.bridge = "{ ...next(operator) }"
+        }
+        */
+        handleBridgeProps(this, bridge)
+
+        /* moved
+        if (!bridge.level) {
+          bridge.level = 0
+        }
+        */
         /*
         if (bridge.generator) {
           this.config.generators.push({ 
@@ -1126,6 +1233,7 @@ class Config {
           })
         }
         */
+        /* moved 
         if (bridge.children) {
           for (let child of bridge.children) {
             this.addHierarchy(child, bridge.id)
@@ -1141,6 +1249,8 @@ class Config {
             this.addHierarchy(bridge.id, parent)
           }
         }
+        */
+        /* moved
         if (bridge.before) {
           for (let after of bridge.before) {
             if (typeof after == 'string') {
@@ -1163,6 +1273,8 @@ class Config {
         if (bridge.generator) {
           this.config.generators.unshift(bridge.generator)
         }
+        */
+        /* moved
         if (bridge.generators) {
           const generators = [...bridge.generators]
           generators.reverse()
@@ -1199,6 +1311,7 @@ class Config {
             apply: (args) => bridge.semantic(args),
           })
         }
+        */
       }
       if (config.operators) {
         config.operators = config.operators.map((operator) => {
@@ -2560,9 +2673,6 @@ class Config {
         // 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 {