tpmkms_4wp 9.5.1 → 9.6.0

package/common/math.instance.json

@@ -16,11 +16,11 @@
         "([divideByExpression|])",
         {
           "pattern": "([x])",
-          "development": true
+          "scope": "testing"
         },
         {
           "pattern": "([y])",
-          "development": true
+          "scope": "testing"
         }
       ],
       "bridges": [
@@ -47,7 +47,7 @@
           ],
           "level": 0,
           "bridge": "{ ...next(operator) }",
-          "development": true
+          "scope": "testing"
         },
         {
           "id": "y",
@@ -56,10 +56,10 @@
           ],
           "level": 0,
           "bridge": "{ ...next(operator) }",
-          "development": true
+          "scope": "testing"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
           "id": "plusOperator",
           "level": 0,
           "bridge": "{ ...next(operator), marker: next(operator('plusExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -80,7 +80,7 @@
           "generatorp": "({context}) => context.word"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
           "id": "plusExpression",
           "level": 0,
           "bridge": "{ ...next(operator) }",
@@ -88,10 +88,10 @@
             "mathematicalExpression"
           ],
           "generatorp": "async ({gp, context}) => `${await gp(context.x)} ${context.word} ${await gp(context.y)}`",
-          "evaluator": "async ({e, context}) => {\n        const x = toValue(await e(context.x)) \n        const y = toValue(await e(context.y))\n        if (!x || !y) {\n          // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n          context.isResponse = false\n        } else {\n          context.evalue = apply(x, y)\n          context.evalue.isResponse = true\n          context.evalue.paraphrase = false\n          // context.paraphrase = false\n          // context.isResponse = true\n        }\n        /*\n        if (!context.value) {\n          context.isResponse = false\n          context.paraphrase = true\n        }\n        */\n      }"
+          "evaluator": "async ({e, context}) => {\n          const x = toValue(await e(context.x)) \n          const y = toValue(await e(context.y))\n          if (!x || !y) {\n            // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n            context.isResponse = false\n          } else {\n            context.evalue = apply(x, y)\n            context.evalue.isResponse = true\n            context.evalue.paraphrase = false\n            // context.paraphrase = false\n            // context.isResponse = true\n          }\n          /*\n          if (!context.value) {\n            context.isResponse = false\n            context.paraphrase = true\n          }\n          */\n        }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
           "id": "minusOperator",
           "level": 0,
           "bridge": "{ ...next(operator), marker: next(operator('minusExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -112,7 +112,7 @@
           "generatorp": "({context}) => context.word"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
           "id": "minusExpression",
           "level": 0,
           "bridge": "{ ...next(operator) }",
@@ -120,10 +120,10 @@
             "mathematicalExpression"
           ],
           "generatorp": "async ({gp, context}) => `${await gp(context.x)} ${context.word} ${await gp(context.y)}`",
-          "evaluator": "async ({e, context}) => {\n        const x = toValue(await e(context.x)) \n        const y = toValue(await e(context.y))\n        if (!x || !y) {\n          // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n          context.isResponse = false\n        } else {\n          context.evalue = apply(x, y)\n          context.evalue.isResponse = true\n          context.evalue.paraphrase = false\n          // context.paraphrase = false\n          // context.isResponse = true\n        }\n        /*\n        if (!context.value) {\n          context.isResponse = false\n          context.paraphrase = true\n        }\n        */\n      }"
+          "evaluator": "async ({e, context}) => {\n          const x = toValue(await e(context.x)) \n          const y = toValue(await e(context.y))\n          if (!x || !y) {\n            // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n            context.isResponse = false\n          } else {\n            context.evalue = apply(x, y)\n            context.evalue.isResponse = true\n            context.evalue.paraphrase = false\n            // context.paraphrase = false\n            // context.isResponse = true\n          }\n          /*\n          if (!context.value) {\n            context.isResponse = false\n            context.paraphrase = true\n          }\n          */\n        }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
           "id": "timesOperator",
           "level": 0,
           "bridge": "{ ...next(operator), marker: next(operator('timesExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -153,7 +153,7 @@
           "generatorp": "({context}) => context.word"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
           "id": "timesExpression",
           "level": 0,
           "bridge": "{ ...next(operator) }",
@@ -161,10 +161,10 @@
             "mathematicalExpression"
           ],
           "generatorp": "async ({gp, context}) => `${await gp(context.x)} ${context.word} ${await gp(context.y)}`",
-          "evaluator": "async ({e, context}) => {\n        const x = toValue(await e(context.x)) \n        const y = toValue(await e(context.y))\n        if (!x || !y) {\n          // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n          context.isResponse = false\n        } else {\n          context.evalue = apply(x, y)\n          context.evalue.isResponse = true\n          context.evalue.paraphrase = false\n          // context.paraphrase = false\n          // context.isResponse = true\n        }\n        /*\n        if (!context.value) {\n          context.isResponse = false\n          context.paraphrase = true\n        }\n        */\n      }"
+          "evaluator": "async ({e, context}) => {\n          const x = toValue(await e(context.x)) \n          const y = toValue(await e(context.y))\n          if (!x || !y) {\n            // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n            context.isResponse = false\n          } else {\n            context.evalue = apply(x, y)\n            context.evalue.isResponse = true\n            context.evalue.paraphrase = false\n            // context.paraphrase = false\n            // context.isResponse = true\n          }\n          /*\n          if (!context.value) {\n            context.isResponse = false\n            context.paraphrase = true\n          }\n          */\n        }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
           "id": "divideByOperator",
           "level": 0,
           "bridge": "{ ...next(operator), marker: next(operator('divideByExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -193,7 +193,7 @@
           "generatorp": "({context}) => context.word"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
           "id": "divideByExpression",
           "level": 0,
           "bridge": "{ ...next(operator) }",
@@ -201,7 +201,7 @@
             "mathematicalExpression"
           ],
           "generatorp": "async ({gp, context}) => `${await gp(context.x)} ${context.word} ${await gp(context.y)}`",
-          "evaluator": "async ({e, context}) => {\n        const x = toValue(await e(context.x)) \n        const y = toValue(await e(context.y))\n        if (!x || !y) {\n          // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n          context.isResponse = false\n        } else {\n          context.evalue = apply(x, y)\n          context.evalue.isResponse = true\n          context.evalue.paraphrase = false\n          // context.paraphrase = false\n          // context.isResponse = true\n        }\n        /*\n        if (!context.value) {\n          context.isResponse = false\n          context.paraphrase = true\n        }\n        */\n      }"
+          "evaluator": "async ({e, context}) => {\n          const x = toValue(await e(context.x)) \n          const y = toValue(await e(context.y))\n          if (!x || !y) {\n            // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n            context.isResponse = false\n          } else {\n            context.evalue = apply(x, y)\n            context.evalue.isResponse = true\n            context.evalue.paraphrase = false\n            // context.paraphrase = false\n            // context.isResponse = true\n          }\n          /*\n          if (!context.value) {\n            context.isResponse = false\n            context.paraphrase = true\n          }\n          */\n        }"
         }
       ]
     }
@@ -878,7 +878,7 @@
             "end": 29
           },
           "dead": true,
-          "modifiers": [
+          "conceptModifiers": [
             {
               "value": "mathematical",
               "unknown": true,
@@ -1088,11 +1088,11 @@
         "([divideByExpression|])",
         {
           "pattern": "([x])",
-          "development": true
+          "scope": "testing"
         },
         {
           "pattern": "([y])",
-          "development": true
+          "scope": "testing"
         }
       ],
       "bridges": [
@@ -1119,7 +1119,7 @@
           ],
           "level": 0,
           "bridge": "{ ...next(operator) }",
-          "development": true
+          "scope": "testing"
         },
         {
           "id": "y",
@@ -1128,10 +1128,10 @@
           ],
           "level": 0,
           "bridge": "{ ...next(operator) }",
-          "development": true
+          "scope": "testing"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
           "id": "plusOperator",
           "level": 0,
           "bridge": "{ ...next(operator), marker: next(operator('plusExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -1151,7 +1151,7 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
           "id": "plusExpression",
           "level": 0,
           "bridge": "{ ...next(operator) }",
@@ -1160,7 +1160,7 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
           "id": "minusOperator",
           "level": 0,
           "bridge": "{ ...next(operator), marker: next(operator('minusExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -1180,7 +1180,7 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
           "id": "minusExpression",
           "level": 0,
           "bridge": "{ ...next(operator) }",
@@ -1189,7 +1189,7 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
           "id": "timesOperator",
           "level": 0,
           "bridge": "{ ...next(operator), marker: next(operator('timesExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -1218,7 +1218,7 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
           "id": "timesExpression",
           "level": 0,
           "bridge": "{ ...next(operator) }",
@@ -1227,7 +1227,7 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
           "id": "divideByOperator",
           "level": 0,
           "bridge": "{ ...next(operator), marker: next(operator('divideByExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -1255,7 +1255,7 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
           "id": "divideByExpression",
           "level": 0,
           "bridge": "{ ...next(operator) }",

package/common/math.js

@@ -18,7 +18,7 @@ const instance = require('./math.instance.json')
 
 
 // TODO need to deal with value vs evalue
-const toValue = (context) => {
+function toValue(context) {
   while( true ) { 
     if (typeof context == 'number' || !context) {
       return context
@@ -27,48 +27,49 @@ const toValue = (context) => {
   }
 }
 
-const mathematicalOperator = (name, words, apply, before = []) => [
-  { 
-      where: where(),
-      id: `${name}Operator`, level: 0, 
-      bridge: `{ ...next(operator), marker: next(operator('${name}Expression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }` ,
-      // bridge: `{ ...next(operator), marker: next(operator('${name}Expression')), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }` ,
-      isA: ['mathematical_operator'],
-      before,
-      localHierarchy: [ ['unknown', 'number'] ],
-      // levelSpecificHierarchy: [[1, 'mathematicalExpression']],
-      words,
-      generatorp: ({context}) => context.word,
-  },
-  { 
-      where: where(),
-      id: `${name}Expression`, level: 0, 
-      bridge: "{ ...next(operator) }" ,
-      isA: ['mathematicalExpression'],
-      generatorp: async ({gp, context}) => `${await gp(context.x)} ${context.word} ${await gp(context.y)}`,
-      evaluator: async ({e, context}) => {
-        const x = toValue(await e(context.x)) 
-        const y = toValue(await e(context.y))
-        if (!x || !y) {
-          // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }
-          context.isResponse = false
-        } else {
-          context.evalue = apply(x, y)
-          context.evalue.isResponse = true
-          context.evalue.paraphrase = false
-          // context.paraphrase = false
-          // context.isResponse = true
-        }
-        /*
-        if (!context.value) {
-          context.isResponse = false
-          context.paraphrase = true
+function mathematicalOperator(name, words, apply, before = []) {
+  return [
+    { 
+        where: where(),
+        id: `${name}Operator`, level: 0, 
+        bridge: `{ ...next(operator), marker: next(operator('${name}Expression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }` ,
+        // bridge: `{ ...next(operator), marker: next(operator('${name}Expression')), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }` ,
+        isA: ['mathematical_operator'],
+        before,
+        localHierarchy: [ ['unknown', 'number'] ],
+        // levelSpecificHierarchy: [[1, 'mathematicalExpression']],
+        words,
+        generatorp: ({context}) => context.word,
+    },
+    { 
+        where: where(),
+        id: `${name}Expression`, level: 0, 
+        bridge: "{ ...next(operator) }" ,
+        isA: ['mathematicalExpression'],
+        generatorp: async ({gp, context}) => `${await gp(context.x)} ${context.word} ${await gp(context.y)}`,
+        evaluator: async ({e, context}) => {
+          const x = toValue(await e(context.x)) 
+          const y = toValue(await e(context.y))
+          if (!x || !y) {
+            // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }
+            context.isResponse = false
+          } else {
+            context.evalue = apply(x, y)
+            context.evalue.isResponse = true
+            context.evalue.paraphrase = false
+            // context.paraphrase = false
+            // context.isResponse = true
+          }
+          /*
+          if (!context.value) {
+            context.isResponse = false
+            context.paraphrase = true
+          }
+          */
         }
-        */
-      }
-  }
-]
-    
+    }
+  ]
+}
 const config = {
   name: 'math',
   operators: [
@@ -82,8 +83,8 @@ const config = {
     "([minusExpression|])", 
     "([timesExpression|])", 
     "([divideByExpression|])", 
-    { pattern: "([x])", development: true },
-    { pattern: "([y])", development: true },
+    { pattern: "([x])", scope: "testing" },
+    { pattern: "([y])", scope: "testing" },
   ],
   bridges: [
     { 
@@ -96,8 +97,8 @@ const config = {
       before: ['verb'],
       after: ['adjective'],
     },
-    { id: "x", isA: ['number'], level: 0, bridge: '{ ...next(operator) }', development: true},
-    { id: "y", isA: ['number'], level: 0, bridge: '{ ...next(operator) }', development: true},
+    { id: "x", isA: ['number'], level: 0, bridge: '{ ...next(operator) }', scope: "testing" },
+    { id: "y", isA: ['number'], level: 0, bridge: '{ ...next(operator) }', scope: "testing" },
     ...mathematicalOperator('plus', ['plus', '+'], (x, y) => x + y),
     ...mathematicalOperator('minus', ['minus', '-'], (x, y) => x - y),
     ...mathematicalOperator('times', ['times', '*'], (x, y) => x * y, [['plusOperator', 0], ['minusOperator', 0]]),

package/common/menus.instance.json

@@ -43,7 +43,7 @@
       "semantics": [
         {
           "match": "({context, isA}) => isA(context, 'showable_menus')",
-          "apply": "async ({context, insert, s, fragments}) => {\n            const value = context\n            const fragment = fragments(\"show showable\")\n            const mappings = [{\n              where: where(),\n              match: ({context}) => context.value == 'showable_menus',\n              apply: ({context}) => Object.assign(context, value),\n            }]\n            const instantiation = await fragment.instantiate(mappings)\n            await s(instantiation)\n          }"
+          "apply": "async ({context, insert, s, fragments}) => {\n            const instantiation = await fragments(\"show showable\", { 'showable_menus': context })\n            await s(instantiation)\n          }"
         }
       ]
     },
@@ -2075,7 +2075,7 @@
             "word": "menu",
             "range": {
               "start": 0,
-              "end": 16
+              "end": 3
             },
             "dead": true,
             "types": [
@@ -3353,7 +3353,7 @@
             "word": "item",
             "range": {
               "start": 0,
-              "end": 16
+              "end": 3
             },
             "dead": true,
             "types": [
@@ -4651,7 +4651,7 @@
             "end": 17
           },
           "dead": true,
-          "modifiers": [
+          "conceptModifiers": [
             {
               "value": "menu_menus",
               "number": "one",
@@ -6017,7 +6017,7 @@
             "text": "menus and menu items",
             "range": {
               "start": 0,
-              "end": 32
+              "end": 19
             },
             "types": [
               "list",
@@ -8839,10 +8839,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
-          "touchedBy": [
-            "menus#call2"
-          ]
+          "context_id": 2
         }
       ],
       "generated": [
@@ -8943,7 +8940,7 @@
       "learned_contextual_priorities": [],
       "rtf_associations": [],
       "query": "show showable",
-      "skipSemantics": false,
+      "skipSemantics": true,
       "key": {
         "query": "show showable"
       }

package/common/menus.js

@@ -156,14 +156,7 @@ const template = {
           where: where(),
           match: ({context, isA}) => isA(context, 'showable_menus'),
           apply: async ({context, insert, s, fragments}) => {
-            const value = context
-            const fragment = fragments("show showable")
-            const mappings = [{
-              where: where(),
-              match: ({context}) => context.value == 'showable_menus',
-              apply: ({context}) => Object.assign(context, value),
-            }]
-            const instantiation = await fragment.instantiate(mappings)
+            const instantiation = await fragments("show showable", { 'showable_menus': context })
             await s(instantiation)
           }
         },
@@ -214,7 +207,7 @@ class UIAPI {
    file (<- instance of menu) menu (<- concept of menu)
 */
 // called for the non-module load to setup fixtures
-const fixtures = async ({api, fragment, s, config, objects, kms, isModule}) => {
+async function fixtures({api, fragment, s, config, objects, kms, isModule}) {
   const fileMenuId = api.addMenu('file')
   const objectMenuId = api.addMenu('object')