tpmkms 9.8.0 → 9.9.0

package/common/actions.instance.json

@@ -46,7 +46,7 @@
               "action": "(@<= 'action' || @<= 'doAction')"
             }
           },
-          "semantic": "async ({context, fragments, e, s, toFinalValue, kms}) => {\n        const instantiation = await fragments(\"quantity in milliseconds\", { quantity: context.delayTime })\n        const result = await e(instantiation)\n        const milliseconds = toFinalValue(toFinalValue(result).amount)\n        await kms.time.api.sleep(milliseconds)\n        await s(context.action)\n      }"
+          "semantic": "async ({context, fragments, e, toFinalValue, kms}) => {\n        const instantiation = await fragments(\"quantity in milliseconds\", { quantity: context.delayTime })\n        const result = await e(instantiation, where())\n        const milliseconds = toFinalValue(toFinalValue(result).amount)\n        await kms.time.api.sleep(milliseconds)\n        await e(context.action, where())\n      }"
         },
         {
           "where": "/home/dev/code/theprogrammablemind/kms/common/actions.js:62",
@@ -142,7 +142,7 @@
               "action"
             ]
           ],
-          "semantic": "async ({context, toArray, s}) => {\n        for (const action of toArray(context.action)) {\n          await s(action)\n        }\n      }"
+          "semantic": "async ({context, toArray, e}) => {\n        for (const action of toArray(context.action)) {\n          await e(action, where())\n        }\n      }"
         }
       ],
       "words": {
@@ -158,7 +158,7 @@
             "defs": [
               {
                 "id": "action",
-                "initial": "{ value: text, instance: true, dead: true }"
+                "initial": "{ value: text, isInstance: true, dead: true }"
               }
             ]
           }
@@ -166,8 +166,8 @@
       },
       "semantics": [
         {
-          "match": "({context, isA, stack, namespaced}) => !context.pullFromContext && !context.evaluate && (isA(context.marker, 'action') || isA(context.marker, 'doAction')) && !namespaced.get('actions', context, 'logged')",
-          "apply": "async ({context, _continue, testLog, g, remember}) => {\n        remember(context)\n        await testLog(() => g(context))\n        _continue()\n      }"
+          "match": "({context, isA, contextHierarchy, stack, namespaced}) => {\n        return !context.pullFromContext && !contextHierarchy.under('call') && (isA(context.marker, 'action') || isA(context.marker, 'doAction')) && !namespaced.get('actions', context, 'logged')\n      }",
+          "apply": "async ({context, _continue, testLog, gp, remember}) => {\n        remember(context)\n        await testLog(() => gp(context))\n        _continue()\n      }"
         }
       ]
     }
@@ -330,7 +330,7 @@
             "defs": [
               {
                 "id": "action",
-                "initial": "{ value: text, instance: true, dead: true }"
+                "initial": "{ value: text, isInstance: true, dead: true }"
               }
             ]
           }
@@ -427,8 +427,7 @@
           },
           "level": 1,
           "context_index": 1,
-          "topLevel": true,
-          "context_id": 2
+          "topLevel": true
         }
       ],
       "generated": [
@@ -536,6 +535,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "quantity in milliseconds",
       "skipSemantics": true,
       "key": {

package/common/actions.js

@@ -50,12 +50,12 @@ const config = {
           action: "(@<= 'action' || @<= 'doAction')",
         },
       },
-      semantic: async ({context, fragments, e, s, toFinalValue, kms}) => {
+      semantic: async ({context, fragments, e, toFinalValue, kms}) => {
         const instantiation = await fragments("quantity in milliseconds", { quantity: context.delayTime })
-        const result = await e(instantiation)
+        const result = await e(instantiation, where())
         const milliseconds = toFinalValue(toFinalValue(result).amount)
         await kms.time.api.sleep(milliseconds)
-        await s(context.action)
+        await e(context.action, where())
       }
     },
     {
@@ -98,9 +98,9 @@ const config = {
       bridge: "{ ...next(operator), value: append(before, operator.value) }",
       semantic: {
         match: ({context}) => context.isList,
-        apply: async ({context, toArray, s}) => {
+        apply: async ({context, toArray, e}) => {
           for (const action of toArray(context)) {
-            await s(action)
+            await e(action, where())
           }
         },
       }
@@ -131,26 +131,28 @@ const config = {
       }`,
       localHierarchy: [['thisitthat', 'action']],
       where: where(),
-      semantic: async ({context, toArray, s}) => {
+      semantic: async ({context, toArray, e}) => {
         for (const action of toArray(context.action)) {
-          await s(action)
+          await e(action, where())
         }
       },
     },
   ],
   words: {
     patterns: [
-      { "pattern": ["action", { type: 'digit' }], allow_partial_matches: false, defs: [{id: "action", initial: "{ value: text, instance: true, dead: true }" }]},
+      { "pattern": ["action", { type: 'digit' }], allow_partial_matches: false, defs: [{id: "action", initial: "{ value: text, isInstance: true, dead: true }" }]},
     ],
   },
   semantics: [
     {
       where: where(),
       priority: -1,
-      match: ({context, isA, stack, namespaced}) => !context.pullFromContext && !context.evaluate && (isA(context.marker, 'action') || isA(context.marker, 'doAction')) && !namespaced.get('actions', context, 'logged'),
-      apply: async ({context, _continue, testLog, g, remember}) => {
+      match: ({context, isA, contextHierarchy, stack, namespaced}) => {
+        return !context.pullFromContext && !contextHierarchy.under('call') && (isA(context.marker, 'action') || isA(context.marker, 'doAction')) && !namespaced.get('actions', context, 'logged')
+      },
+      apply: async ({context, _continue, testLog, gp, remember}) => {
         remember(context)
-        await testLog(() => g(context))
+        await testLog(() => gp(context))
         _continue()
       }
     },

package/common/angle.instance.json

@@ -140,7 +140,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "angle#call2"
           ]
@@ -321,6 +320,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "angle is a dimension",
       "key": {
         "query": "angle is a dimension"
@@ -340,7 +342,7 @@
                 0
               ],
               [
-                "is",
+                "hasPropertyValue",
                 0
               ],
               [
@@ -373,7 +375,7 @@
                 0
               ],
               [
-                "is",
+                "hasPropertyValue",
                 0
               ],
               [
@@ -402,7 +404,7 @@
                 0
               ],
               [
-                "is",
+                "hasPropertyValue",
                 0
               ],
               [
@@ -647,7 +649,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "angle#call2"
           ]
@@ -702,7 +703,7 @@
                 },
                 {
                   "marker": [
-                    "is",
+                    "hasPropertyValue",
                     0
                   ],
                   "range": {
@@ -777,7 +778,7 @@
                 },
                 {
                   "marker": [
-                    "is",
+                    "hasPropertyValue",
                     0
                   ],
                   "range": {
@@ -852,7 +853,7 @@
                 },
                 {
                   "marker": [
-                    "is",
+                    "hasPropertyValue",
                     0
                   ],
                   "range": {
@@ -1118,6 +1119,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "degrees and radians are units of angle",
       "key": {
         "query": "degrees and radians are units of angle"
@@ -1361,7 +1365,7 @@
               },
               "y": {
                 "value": 180,
-                "instance": true,
+                "isInstance": true,
                 "text": "180",
                 "marker": "integer",
                 "word": "180",
@@ -1393,7 +1397,7 @@
             "y": {
               "value": 3.1415926,
               "integer": "many",
-              "instance": true,
+              "isInstance": true,
               "marker": "integer",
               "word": "pi",
               "text": "pi",
@@ -1425,7 +1429,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "angle#call2"
           ]
@@ -1781,6 +1784,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "degrees = radians * 180 / pi",
       "key": {
         "query": "degrees = radians * 180 / pi"
@@ -2025,7 +2031,7 @@
               "y": {
                 "value": 3.1415926,
                 "integer": "many",
-                "instance": true,
+                "isInstance": true,
                 "marker": "integer",
                 "word": "pi",
                 "text": "pi",
@@ -2056,7 +2062,7 @@
             },
             "y": {
               "value": 180,
-              "instance": true,
+              "isInstance": true,
               "text": "180",
               "marker": "integer",
               "word": "180",
@@ -2088,7 +2094,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "angle#call2"
           ]
@@ -2444,6 +2449,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "radians = degrees * pi / 180",
       "key": {
         "query": "radians = degrees * pi / 180"
@@ -2650,7 +2658,7 @@
             },
             {
               "marker": [
-                "is",
+                "hasPropertyValue",
                 0
               ],
               "range": {
@@ -2725,7 +2733,7 @@
             },
             {
               "marker": [
-                "is",
+                "hasPropertyValue",
                 0
               ],
               "range": {
@@ -2800,7 +2808,7 @@
             },
             {
               "marker": [
-                "is",
+                "hasPropertyValue",
                 0
               ],
               "range": {

package/common/animals.instance.json

@@ -25,7 +25,7 @@
             ],
             "ops": [
               [
-                "is",
+                "hasPropertyValue",
                 0
               ],
               [
@@ -54,7 +54,7 @@
             ],
             "ops": [
               [
-                "is",
+                "hasPropertyValue",
                 0
               ],
               [
@@ -79,7 +79,7 @@
             ],
             "ops": [
               [
-                "is",
+                "hasPropertyValue",
                 0
               ],
               [
@@ -233,7 +233,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "animals#call2"
           ]
@@ -288,7 +287,7 @@
                 },
                 {
                   "marker": [
-                    "is",
+                    "hasPropertyValue",
                     0
                   ],
                   "range": {
@@ -343,7 +342,7 @@
                 },
                 {
                   "marker": [
-                    "is",
+                    "hasPropertyValue",
                     0
                   ],
                   "range": {
@@ -398,7 +397,7 @@
                 },
                 {
                   "marker": [
-                    "is",
+                    "hasPropertyValue",
                     0
                   ],
                   "range": {
@@ -544,6 +543,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "birds and mammals are animals",
       "key": {
         "query": "birds and mammals are animals"
@@ -647,7 +649,7 @@
             "level": 0
           },
           "property": {
-            "value": "ears",
+            "value": "ear",
             "unknown": true,
             "text": "ears",
             "marker": "property",
@@ -670,7 +672,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "sameWasProcessed": true,
           "touchedBy": [
             "animals#call2"
@@ -832,6 +833,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "mammals have ears",
       "key": {
         "query": "mammals have ears"
@@ -958,7 +962,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "sameWasProcessed": true,
           "touchedBy": [
             "animals#call2"
@@ -1120,6 +1123,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "mammals have hair",
       "key": {
         "query": "mammals have hair"
@@ -1253,7 +1259,7 @@
             "level": 0
           },
           "property": {
-            "value": "wings",
+            "value": "wing",
             "unknown": true,
             "text": "wings",
             "marker": "property",
@@ -1276,7 +1282,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "sameWasProcessed": true,
           "touchedBy": [
             "animals#call2"
@@ -1503,6 +1508,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "mammals dont have wings",
       "key": {
         "query": "mammals dont have wings"
@@ -1629,7 +1637,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "sameWasProcessed": true,
           "touchedBy": [
             "animals#call2"
@@ -1791,6 +1798,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "animals have skin",
       "key": {
         "query": "animals have skin"
@@ -1894,7 +1904,7 @@
             "level": 0
           },
           "property": {
-            "value": "eyes",
+            "value": "eye",
             "unknown": true,
             "text": "eyes",
             "marker": "property",
@@ -1917,7 +1927,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "sameWasProcessed": true,
           "touchedBy": [
             "animals#call2"
@@ -2079,6 +2088,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "animals have eyes",
       "key": {
         "query": "animals have eyes"
@@ -2182,7 +2194,7 @@
             "level": 0
           },
           "property": {
-            "value": "wings",
+            "value": "wing",
             "unknown": true,
             "text": "wings",
             "marker": "property",
@@ -2205,7 +2217,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "sameWasProcessed": true,
           "touchedBy": [
             "animals#call2"
@@ -2367,6 +2378,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "birds have wings",
       "key": {
         "query": "birds have wings"
@@ -2470,7 +2484,7 @@
             "level": 0
           },
           "property": {
-            "value": "beaks",
+            "value": "beak",
             "unknown": true,
             "text": "beaks",
             "marker": "property",
@@ -2493,7 +2507,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "sameWasProcessed": true,
           "touchedBy": [
             "animals#call2"
@@ -2655,6 +2668,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "birds have beaks",
       "key": {
         "query": "birds have beaks"
@@ -3022,7 +3038,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "animals#call2"
           ]
@@ -3623,6 +3638,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "humans bats felines and canines are mammals",
       "key": {
         "query": "humans bats felines and canines are mammals"
@@ -3990,7 +4008,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "animals#call2"
           ]
@@ -4591,6 +4608,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "owls eagles pidgeons and parrots are birds",
       "key": {
         "query": "owls eagles pidgeons and parrots are birds"
@@ -4714,7 +4734,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "animals#call2"
           ]
@@ -4875,6 +4894,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "cats are felines",
       "key": {
         "query": "cats are felines"
@@ -5098,7 +5120,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "animals#call2"
           ]
@@ -5389,6 +5410,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "dogs and wolves are canines",
       "key": {
         "query": "dogs and wolves are canines"
@@ -5492,7 +5516,7 @@
             "level": 0
           },
           "property": {
-            "value": "wings",
+            "value": "wing",
             "unknown": true,
             "text": "wings",
             "marker": "property",
@@ -5515,7 +5539,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "sameWasProcessed": true,
           "touchedBy": [
             "animals#call2"
@@ -5677,6 +5700,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "bats have wings",
       "key": {
         "query": "bats have wings"
@@ -5723,7 +5749,7 @@
             },
             {
               "marker": [
-                "is",
+                "hasPropertyValue",
                 0
               ],
               "range": {
@@ -5778,7 +5804,7 @@
             },
             {
               "marker": [
-                "is",
+                "hasPropertyValue",
                 0
               ],
               "range": {
@@ -5833,7 +5859,7 @@
             },
             {
               "marker": [
-                "is",
+                "hasPropertyValue",
                 0
               ],
               "range": {