theprogrammablemind 7.12.8-beta.0 → 7.12.8-beta.1

package/package.json

@@ -65,6 +65,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.12.8-beta.0",
+  "version": "7.12.8-beta.1",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -213,6 +213,9 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
           config.addHierarchy(child, bridge.id)
         }
       }
+      if (bridge.operator) {
+        config.addOperator(bridge.operator, uuid || config.uuid)
+      }
       if (bridge.parents) {
         for (const parent of bridge.parents) {
           config.addHierarchy(bridge.id, parent)
@@ -329,7 +332,7 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
       if (bridge.semantic) {
         const semantic = {
           where: bridge.semantic.where || bridge.where || client.where(3),
-          match: ({ context }) => bridge.id == context.marker,
+          match: ({ context }) => bridge.id == context.marker && !context.evaluate,
           apply: (args) => bridge.semantic(args),
           applyWrapped: bridge.semantic,
           property: 'semantic'
@@ -348,7 +351,7 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
   if (moreConfig.bridges) {
     moreConfig.bridges = moreConfig.bridges.map((bridge) => {
       bridge = { ...bridge }
-      const valid = ['after', 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
+      const valid = ['after', 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'operator', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
         'level', 'optional', 'selector', 'semantic', 'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid']
       helpers.validProps(valid, bridge, 'bridge')
       handleBridgeProps(baseConfig, bridge, { addFirst, uuid })
@@ -453,6 +456,7 @@ const normalizeConfig = (config) => {
         }
       }
     }
+
     if (config.bridges) {
       for (const bridge of config.bridges) {
         if (!bridge.level) {
@@ -471,6 +475,14 @@ const normalizeConfig = (config) => {
         }
       }
     }
+
+    if (config.operators) {
+      for (let i = 0; i < config.operators.length; ++i) {
+        if (typeof config.operators[i] === 'string') {
+          config.operators[i] = { pattern: config.operators[i] }
+        }
+      }
+    }
   }
 }