tpmkms 9.8.0 → 9.9.0

package/common/time.instance.json

@@ -143,7 +143,22 @@
           "isA": [
             "preposition"
           ],
-          "bridge": "{ ...next(operator), time: after[0], operator: operator,  interpolate: '${operator} ${time}' }"
+          "bridge": "{ ...next(operator), time: after[0], operator: operator,  interpolate: '${operator} ${time}' }",
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "time"
+          ]
         },
         {
           "id": "ampm",
@@ -185,7 +200,7 @@
       },
       "generators": [
         {
-          "match": "({context}) => context.marker == 'timePoint' && context.evalue && context.format == 12",
+          "match": "({context}) => context.marker == 'timePoint' && context.evalue && context.format == 12 && !context.paraphrase",
           "apply": "({context}) => {\n            let hh = context.evalue.getHours();\n            let ampm = 'am'\n            if (hh > 12) {\n              hh -= 12;\n              ampm = 'pm'\n            }\n            let ss = context.evalue.getMinutes()\n            ss = pad(ss, 2)\n            return `${hh}:${ss} ${ampm}` \n          }"
         },
         {
@@ -199,11 +214,11 @@
       ],
       "semantics": [
         {
-          "match": "(args) => args.callOnce(args, ({context}) => context.repeats) && args.context.repeats?.repeats",
-          "apply": "async ({context, e, s, handlerStack}) => {\n            const v = (await e(context.repeats.repeats)).evalue\n            for (let i = 0; i < v; ++i) {\n              if (context.action) {\n                await s(context.action)\n              } else {\n                const repeats = context.repeats\n                context.repeats = undefined\n                await s(context)\n                context.repeats = repeats\n              }\n            }\n          }"
+          "match": "async (args) => await args.callOnce(args, 'time.1', ({context}) => context.repeats) && args.context.repeats?.repeats",
+          "apply": "async ({context, e, handlerStack, toFinalValue}) => {\n            const v = toFinalValue((await e(context.repeats.repeats, where())))\n            for (let i = 0; i < v; ++i) {\n              if (context.action) {\n                await e(context.action, where())\n              } else {\n                const repeats = context.repeats\n                context.repeats = undefined\n                await e(context, where())\n                context.repeats = repeats\n              }\n            }\n          }"
         },
         {
-          "match": "({objects, context, api}) => context.marker == 'timePoint' && context.evaluate",
+          "match": "({objects, context, api}) => context.marker == 'timePoint' && !context.isInstance",
           "apply": "({objects, context, api}) => {\n            context.evalue = api.newDate()\n            context.format = objects.format\n          }"
         },
         {
@@ -351,11 +366,7 @@
           "dead": true,
           "level": 2,
           "context_index": 1,
-          "topLevel": true,
-          "context_id": 2,
-          "touchedBy": [
-            "time#call2"
-          ]
+          "topLevel": true
         }
       ],
       "generated": [
@@ -533,6 +544,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "concept is a property",
       "isFragment": true,
       "key": {
@@ -1693,7 +1707,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "time#call2"
           ]
@@ -4559,6 +4572,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "years, months, days, hours, minutes, milliseconds and seconds are units of time",
       "key": {
         "query": "years, months, days, hours, minutes, milliseconds and seconds are units of time"
@@ -4733,7 +4749,7 @@
             },
             "y": {
               "value": 12,
-              "instance": true,
+              "isInstance": true,
               "text": "12",
               "marker": "integer",
               "word": "12",
@@ -4765,7 +4781,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "time#call2"
           ]
@@ -5006,6 +5021,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "years = months / 12",
       "key": {
         "query": "years = months / 12"
@@ -5180,7 +5198,7 @@
             },
             "y": {
               "value": 60,
-              "instance": true,
+              "isInstance": true,
               "text": "60",
               "marker": "integer",
               "word": "60",
@@ -5212,7 +5230,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "time#call2"
           ]
@@ -5453,6 +5470,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "hours = minutes / 60",
       "key": {
         "query": "hours = minutes / 60"
@@ -5627,7 +5647,7 @@
             },
             "y": {
               "value": 60,
-              "instance": true,
+              "isInstance": true,
               "text": "60",
               "marker": "integer",
               "word": "60",
@@ -5659,7 +5679,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "time#call2"
           ]
@@ -5900,6 +5919,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "minutes = hours * 60",
       "key": {
         "query": "minutes = hours * 60"
@@ -6074,7 +6096,7 @@
             },
             "y": {
               "value": 60,
-              "instance": true,
+              "isInstance": true,
               "text": "60",
               "marker": "integer",
               "word": "60",
@@ -6106,7 +6128,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "time#call2"
           ]
@@ -6347,6 +6368,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "seconds = minutes * 60",
       "key": {
         "query": "seconds = minutes * 60"
@@ -6521,7 +6545,7 @@
             },
             "y": {
               "value": 3600,
-              "instance": true,
+              "isInstance": true,
               "text": "3600",
               "marker": "integer",
               "word": "3600",
@@ -6553,7 +6577,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "time#call2"
           ]
@@ -6794,6 +6817,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "hours = seconds / 3600",
       "key": {
         "query": "hours = seconds / 3600"
@@ -6968,7 +6994,7 @@
             },
             "y": {
               "value": 3600,
-              "instance": true,
+              "isInstance": true,
               "text": "3600",
               "marker": "integer",
               "word": "3600",
@@ -7000,7 +7026,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "time#call2"
           ]
@@ -7241,6 +7266,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "seconds = hours * 3600",
       "key": {
         "query": "seconds = hours * 3600"
@@ -7484,7 +7512,7 @@
               },
               "y": {
                 "value": 60,
-                "instance": true,
+                "isInstance": true,
                 "text": "60",
                 "marker": "integer",
                 "word": "60",
@@ -7515,7 +7543,7 @@
             },
             "y": {
               "value": 1000,
-              "instance": true,
+              "isInstance": true,
               "text": "1000",
               "marker": "integer",
               "word": "1000",
@@ -7547,7 +7575,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "time#call2"
           ]
@@ -7903,6 +7930,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "milliseconds = minutes * 60 * 1000",
       "key": {
         "query": "milliseconds = minutes * 60 * 1000"
@@ -8146,7 +8176,7 @@
               },
               "y": {
                 "value": 1000,
-                "instance": true,
+                "isInstance": true,
                 "text": "1000",
                 "marker": "integer",
                 "word": "1000",
@@ -8177,7 +8207,7 @@
             },
             "y": {
               "value": 60,
-              "instance": true,
+              "isInstance": true,
               "text": "60",
               "marker": "integer",
               "word": "60",
@@ -8209,7 +8239,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "time#call2"
           ]
@@ -8565,6 +8594,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "minutes = milliseconds / 1000 / 60",
       "key": {
         "query": "minutes = milliseconds / 1000 / 60"
@@ -8739,7 +8771,7 @@
             },
             "y": {
               "value": 1000,
-              "instance": true,
+              "isInstance": true,
               "text": "1000",
               "marker": "integer",
               "word": "1000",
@@ -8771,7 +8803,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "time#call2"
           ]
@@ -9012,6 +9043,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "milliseconds = seconds * 1000",
       "key": {
         "query": "milliseconds = seconds * 1000"
@@ -9186,7 +9220,7 @@
             },
             "y": {
               "value": 1000,
-              "instance": true,
+              "isInstance": true,
               "text": "1000",
               "marker": "integer",
               "word": "1000",
@@ -9218,7 +9252,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "time#call2"
           ]
@@ -9459,6 +9492,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "seconds = milliseconds / 1000",
       "key": {
         "query": "seconds = milliseconds / 1000"
@@ -9633,7 +9669,7 @@
             },
             "y": {
               "value": 60,
-              "instance": true,
+              "isInstance": true,
               "text": "60",
               "marker": "integer",
               "word": "60",
@@ -9665,7 +9701,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "time#call2"
           ]
@@ -9906,6 +9941,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "minutes = seconds / 60",
       "key": {
         "query": "minutes = seconds / 60"
@@ -10080,7 +10118,7 @@
             },
             "y": {
               "value": 24,
-              "instance": true,
+              "isInstance": true,
               "text": "24",
               "marker": "integer",
               "word": "24",
@@ -10112,7 +10150,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "time#call2"
           ]
@@ -10353,6 +10390,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "day = hours / 24",
       "key": {
         "query": "day = hours / 24"
@@ -10527,7 +10567,7 @@
             },
             "y": {
               "value": 24,
-              "instance": true,
+              "isInstance": true,
               "text": "24",
               "marker": "integer",
               "word": "24",
@@ -10559,7 +10599,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "time#call2"
           ]
@@ -10800,6 +10839,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "hours = days * 24",
       "key": {
         "query": "hours = days * 24"
@@ -10928,7 +10970,22 @@
           "isA": [
             "preposition"
           ],
-          "bridge": "{ ...next(operator), time: after[0], operator: operator,  interpolate: '${operator} ${time}' }"
+          "bridge": "{ ...next(operator), time: after[0], operator: operator,  interpolate: '${operator} ${time}' }",
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "time"
+          ]
         },
         {
           "id": "ampm",
@@ -10970,31 +11027,31 @@
       },
       "generators": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/time.js:172"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/time.js:173"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/time.js:187"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/time.js:188"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/time.js:200"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/time.js:201"
         }
       ],
       "semantics": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/time.js:208",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/time.js:209",
           "priority": -1
         },
         {
           "notes": "evaluate time",
-          "where": "/home/dev/code/theprogrammablemind/kms/common/time.js:227"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/time.js:228"
         },
         {
           "notes": "use time format working case",
-          "where": "/home/dev/code/theprogrammablemind/kms/common/time.js:236"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/time.js:237"
         },
         {
           "notes": "use time format error case",
-          "where": "/home/dev/code/theprogrammablemind/kms/common/time.js:244"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/time.js:245"
         }
       ]
     }

package/common/time.js

@@ -140,7 +140,8 @@ const template = {
           id: "atTime", 
           words: ['@'],
           isA: ['preposition'],
-          bridge: "{ ...next(operator), time: after[0], operator: operator,  interpolate: '${operator} ${time}' }" 
+          bridge: "{ ...next(operator), time: after[0], operator: operator,  interpolate: '${operator} ${time}' }",
+          check: defaultContextCheckProperties(['time']),
         },
         { 
           id: "ampm", 
@@ -170,7 +171,7 @@ const template = {
       generators: [
         { 
           where: where(),
-          match: ({context}) => context.marker == 'timePoint' && context.evalue && context.format == 12, 
+          match: ({context}) => context.marker == 'timePoint' && context.evalue && context.format == 12 && !context.paraphrase, 
           apply: ({context}) => {
             let hh = context.evalue.getHours();
             let ampm = 'am'
@@ -207,16 +208,16 @@ const template = {
         {
           where: where(),
           priority: -1,
-          match: (args) => args.callOnce(args, ({context}) => context.repeats) && args.context.repeats?.repeats,
-          apply: async ({context, e, s, handlerStack}) => {
-            const v = (await e(context.repeats.repeats)).evalue
+          match: async (args) => await args.callOnce(args, 'time.1', ({context}) => context.repeats) && args.context.repeats?.repeats,
+          apply: async ({context, e, handlerStack, toFinalValue}) => {
+            const v = toFinalValue((await e(context.repeats.repeats, where())))
             for (let i = 0; i < v; ++i) {
               if (context.action) {
-                await s(context.action)
+                await e(context.action, where())
               } else {
                 const repeats = context.repeats
                 context.repeats = undefined
-                await s(context)
+                await e(context, where())
                 context.repeats = repeats
               }
             }
@@ -225,7 +226,7 @@ const template = {
         {
           notes: 'evaluate time',
           where: where(),
-          match: ({objects, context, api}) => context.marker == 'timePoint' && context.evaluate, 
+          match: ({objects, context, api}) => context.marker == 'timePoint' && !context.isInstance,
           apply: ({objects, context, api}) => {
             context.evalue = api.newDate()
             context.format = objects.format

package/common/ui.instance.json

@@ -79,8 +79,7 @@
           ],
           "level": 1,
           "context_index": 1,
-          "topLevel": true,
-          "context_id": 2
+          "topLevel": true
         }
       ],
       "generated": [
@@ -143,6 +142,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "move direction",
       "skipSemantics": true,
       "key": {

package/common/ui.js

@@ -62,9 +62,9 @@ const config = {
     {
       where: where(),
       match: ({context, isA}) => isA(context, 'direction'),
-      apply: async ({context, insert, s, fragments}) => {
+      apply: async ({context, insert, e, fragments}) => {
         const instantiation = await fragments("move direction", { direction:  context })
-        await s(instantiation)
+        await e(instantiation, where())
       }
     },
   ],
@@ -124,12 +124,12 @@ const config = {
          1: "{ marker: 'moveable', pullFromContext: true, default: true, skipDefault: true }" 
        },
        bridge: "{ ...next(operator), operator: operator, moveable: after[0], direction: after[1], generate: ['operator', 'moveable', 'direction' ] }",
-       semantic: async ({api, context, e}) => {
+       semantic: async ({api, context, toFinalValue, e}) => {
          if (context.direction?.steps?.quantity) {
            api.move(context.direction.value, context.direction.steps.quantity.value, context.direction.steps.marker)
          } else {
-           const steps = await e(context.direction.steps)
-           api.move(context.direction.value, steps?.evalue || 1)
+           const steps = toFinalValue(await e(context.direction.steps, where()))
+           api.move(context.direction.value, steps || 1)
            // api.move(context.direction.value, context.direction.steps ? context.direction.steps.value : 1)
          }
        }