tpmkms_4wp 9.8.0-beta.10 → 9.8.0-beta.16

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": {
@@ -167,7 +167,7 @@
       "semantics": [
         {
           "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, g, remember}) => {\n        remember(context)\n        await testLog(() => g(context))\n        _continue()\n      }"
+          "apply": "async ({context, _continue, testLog, gp, remember}) => {\n        remember(context)\n        await testLog(() => gp(context))\n        _continue()\n      }"
         }
       ]
     }

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,9 +131,9 @@ 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())
         }
       },
     },
@@ -150,9 +150,9 @@ const config = {
       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, g, remember}) => {
+      apply: async ({context, _continue, testLog, gp, remember}) => {
         remember(context)
-        await testLog(() => g(context))
+        await testLog(() => gp(context))
         _continue()
       }
     },

package/common/askfor.instance.json

@@ -34,7 +34,7 @@
           "isA": [
             "queryable"
           ],
-          "evaluator": "async ({kms, context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {\n            const known = await kms.properties.api.getProperty(context.subjects[0], 'property')\n            resolveEvaluate(context, known)\n          }"
+          "semantic": "async ({kms, context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {\n            const known = await kms.properties.api.getProperty(context.subjects[0], 'property')\n            resolveEvaluate(context, known)\n          }"
         },
         {
           "id": "information",
@@ -42,7 +42,7 @@
           "isA": [
             "noun"
           ],
-          "evaluator": "async ({context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {\n            const properties = objects.askFor\n            const values = []\n            for (const property of properties) {\n              // const value = toEValue(await e(property))\n              const value = (await e(property)).evalue\n              values.push({ marker: 'labelledValue', label: property, value })\n            }\n            resolveEvaluate(context, toList(values))\n          }"
+          "semantic": "async ({context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {\n            const properties = objects.askFor\n            const values = []\n            for (const property of properties) {\n              try {\n                const value = (await e(property, where())).evalue\n                values.push({ marker: 'labelledValue', label: property, value })\n              } catch( e ) {\n              }\n            }\n            resolveEvaluate(context, toList(values))\n          }"
         },
         {
           "id": "for_askfor",
@@ -59,7 +59,7 @@
         },
         {
           "id": "askfor_askfor",
-          "where": "/home/dev/code/theprogrammablemind/kms/common/askfor.js:112",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/askfor.js:114",
           "isA": [
             "verb"
           ],
@@ -67,7 +67,7 @@
             "ask"
           ],
           "bridge": "{\n            ...next(operator),\n            properties: after[0],\n            interpolate: [{ self: true }, { property: 'properties' }]\n          }",
-          "semantic": "async ({e, s, gp, objects, flatten, context, ask, fragments, toEValue}) => {\n            const argument = context.properties.argument\n            const getValue = (property) => async (args) => {\n              const value = toEValue(await e(property))\n              if (value.marker === 'undefined') {\n                return\n              }\n              return value\n            }\n\n            const setValue = (property) => async ({ context, namespaced, tag }) => {\n              const is = { marker: 'is', one: property, two: context }\n              namespaced.set('dialogs', is, 'allowHierarchy', false)\n              await s(is)\n            }\n\n            const properties = flattenInPlace(argument)\n            counter = 0\n            for (const property of properties.reverse()) {\n              counter += 1\n              const query = memoizeAsync(async () => await(gp(await fragments(\"what is the concept?\", { concept: property }))))\n              const compatible_types = property.compatible_types || [property.marker]\n              const matchr = ({context, isA}) => {\n                return !context.same && isA(context, compatible_types)\n              }\n              objects.askFor.push(property);\n              askForProperty({\n                ask,\n                tag: `ask#${counter}`,\n                getValue: getValue(property),\n                setValue: setValue(property),\n                query,\n                matchr,\n              })\n            }\n          }"
+          "semantic": "async ({e, gp, objects, flatten, context, ask, fragments, toEValue}) => {\n            const argument = context.properties.argument\n            const getValue = (property) => async (args) => {\n              try {\n                const value = toEValue(await e(property, where()))\n                if (value.marker === 'undefined') {\n                  return\n                }\n                return value\n              } catch (e) {\n              }\n            }\n\n            const setValue = (property) => async ({ context, namespaced, tag }) => {\n              const is = { marker: 'is', one: property, two: context }\n              namespaced.set('dialogs', is, 'allowHierarchy', false)\n              await e(is, where())\n            }\n\n            const properties = flattenInPlace(argument)\n            counter = 0\n            for (const property of properties.reverse()) {\n              counter += 1\n              const query = memoizeAsync(async () => await(gp(await fragments(\"what is the concept?\", { concept: property }))))\n              const compatible_types = property.compatible_types || [property.marker]\n              const matchr = ({context, isA}) => {\n                return !context.same && isA(context, compatible_types)\n              }\n              objects.askFor.push(property);\n              askForProperty({\n                ask,\n                tag: `ask#${counter}`,\n                getValue: getValue(property),\n                setValue: setValue(property),\n                query,\n                matchr,\n              })\n            }\n          }"
         }
       ]
     },
@@ -443,189 +443,11 @@
           ],
           "level": 2,
           "context_index": 1,
-          "topLevel": true,
-          "evalue": {
-            "default": true,
-            "marker": "is",
-            "one": {
-              "marker": "concept",
-              "value": "concept",
-              "default": true,
-              "text": "the concept",
-              "dead": true,
-              "word": "concept",
-              "range": {
-                "start": 8,
-                "end": 18
-              },
-              "types": [
-                "concept"
-              ],
-              "focusableForPhrase": true,
-              "pullFromContext": true,
-              "concept": true,
-              "wantsValue": true,
-              "checks": [
-                "determiner"
-              ],
-              "determiner": {
-                "modifiers": [],
-                "text": "the",
-                "marker": "the",
-                "word": "the",
-                "range": {
-                  "start": 8,
-                  "end": 10
-                },
-                "level": 0
-              },
-              "theable": {
-                "marker": "concept",
-                "value": "concept",
-                "default": true,
-                "text": "concept",
-                "dead": true,
-                "word": "concept",
-                "range": {
-                  "start": 12,
-                  "end": 18
-                },
-                "types": [
-                  "concept"
-                ],
-                "level": 0
-              },
-              "flattenInPlace": [
-                [
-                  "value",
-                  "theable"
-                ]
-              ],
-              "flatten_ignore": [
-                "theable"
-              ],
-              "interpolate": [
-                {
-                  "property": "determiner"
-                },
-                {
-                  "property": "theable"
-                }
-              ],
-              "level": 0
-            },
-            "two": {
-              "marker": "concept",
-              "value": {
-                "marker": "surname",
-                "isVariable": true,
-                "evaluate": false,
-                "pullFromContext": false,
-                "value": "last_name",
-                "fromSTM": true,
-                "namespaced": {
-                  "stm": {
-                    "id": 1
-                  }
-                }
-              },
-              "default": true,
-              "text": "the concept",
-              "dead": true,
-              "word": "concept",
-              "range": {
-                "start": 8,
-                "end": 18
-              },
-              "types": [
-                "concept"
-              ],
-              "focusableForPhrase": true,
-              "pullFromContext": true,
-              "concept": true,
-              "wantsValue": true,
-              "checks": [
-                "determiner"
-              ],
-              "determiner": {
-                "modifiers": [],
-                "text": "the",
-                "marker": "the",
-                "word": "the",
-                "range": {
-                  "start": 8,
-                  "end": 10
-                },
-                "level": 0
-              },
-              "theable": {
-                "marker": "concept",
-                "value": "concept",
-                "default": true,
-                "text": "concept",
-                "dead": true,
-                "word": "concept",
-                "range": {
-                  "start": 12,
-                  "end": 18
-                },
-                "types": [
-                  "concept"
-                ],
-                "level": 0
-              },
-              "flattenInPlace": [
-                [
-                  "value",
-                  "theable"
-                ]
-              ],
-              "flatten_ignore": [
-                "theable"
-              ],
-              "interpolate": [
-                {
-                  "property": "determiner"
-                },
-                {
-                  "property": "theable"
-                }
-              ],
-              "level": 0,
-              "evalue": {
-                "marker": "surname",
-                "isVariable": true,
-                "evaluate": false,
-                "pullFromContext": false,
-                "value": "last_name",
-                "fromSTM": true,
-                "namespaced": {
-                  "stm": {
-                    "id": 1
-                  }
-                }
-              },
-              "touchedBy": [
-                "askfor#call3",
-                "askfor#call2"
-              ],
-              "instance": true,
-              "focus": true
-            },
-            "focusable": [
-              "two",
-              "one"
-            ],
-            "word": "is"
-          },
-          "isResponse": true,
-          "touchedBy": [
-            "askfor#call2"
-          ]
+          "topLevel": true
         }
       ],
       "generated": [
-        "the concept is last_name"
+        ""
       ],
       "paraphrases": [
         "what is the concept?"
@@ -633,7 +455,7 @@
       "paraphrasesParenthesized": [],
       "generatedParenthesized": [],
       "responses": [
-        "the concept is last_name"
+        ""
       ],
       "associations": [],
       "summaries": [
@@ -923,7 +745,7 @@
         },
         {
           "id": "askfor_askfor",
-          "where": "/home/dev/code/theprogrammablemind/kms/common/askfor.js:112",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/askfor.js:114",
           "isA": [
             "verb"
           ],

package/common/askfor.js

@@ -76,7 +76,7 @@ const template = {
           id: 'known',
           where: where(),
           isA: ['queryable'],
-          evaluator: async ({kms, context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {
+          semantic: async ({kms, context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {
             const known = await kms.properties.api.getProperty(context.subjects[0], 'property')
             resolveEvaluate(context, known)
           },
@@ -85,13 +85,15 @@ const template = {
           id: 'information',
           where: where(),
           isA: ['noun'],
-          evaluator: async ({context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {
+          semantic: async ({context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {
             const properties = objects.askFor
             const values = []
             for (const property of properties) {
-              // const value = toEValue(await e(property))
-              const value = (await e(property)).evalue
-              values.push({ marker: 'labelledValue', label: property, value })
+              try {
+                const value = (await e(property, where())).evalue
+                values.push({ marker: 'labelledValue', label: property, value })
+              } catch( e ) {
+              }
             }
             resolveEvaluate(context, toList(values))
           },
@@ -117,20 +119,23 @@ const template = {
             properties: after[0],
             interpolate: [{ self: true }, { property: 'properties' }]
           }`,
-          semantic: async ({e, s, gp, objects, flatten, context, ask, fragments, toEValue}) => {
+          semantic: async ({e, gp, objects, flatten, context, ask, fragments, toEValue}) => {
             const argument = context.properties.argument
             const getValue = (property) => async (args) => {
-              const value = toEValue(await e(property))
-              if (value.marker === 'undefined') {
-                return
+              try {
+                const value = toEValue(await e(property, where()))
+                if (value.marker === 'undefined') {
+                  return
+                }
+                return value
+              } catch (e) {
               }
-              return value
             }
 
             const setValue = (property) => async ({ context, namespaced, tag }) => {
               const is = { marker: 'is', one: property, two: context }
               namespaced.set('dialogs', is, 'allowHierarchy', false)
-              await s(is)
+              await e(is, where())
             }
 
             const properties = flattenInPlace(argument)

package/common/can.instance.json

@@ -298,15 +298,7 @@
           "voice": "passive",
           "level": 1,
           "context_index": 1,
-          "topLevel": true,
-          "control": {
-            "seen": {
-              "length": 0
-            }
-          },
-          "touchedBy": [
-            "can#call2"
-          ]
+          "topLevel": true
         }
       ],
       "generated": [
@@ -801,15 +793,7 @@
           ],
           "level": 1,
           "context_index": 1,
-          "topLevel": true,
-          "control": {
-            "seen": {
-              "length": 0
-            }
-          },
-          "touchedBy": [
-            "can#call2"
-          ]
+          "topLevel": true
         }
       ],
       "generated": [

package/common/can.js

@@ -115,7 +115,7 @@ const config = {
   semantics: [
     {
       match: ({context}) => context.toVoice == 'passive',
-      apply: async ({g, context, fragmentMapper}) => {
+      apply: async ({g, context}) => {
         for (const element of propertyToArray(context)) {
           if (!element.voice) {
             continue
@@ -140,7 +140,7 @@ const config = {
     },
     {
       match: ({context}) => context.toVoice == 'active',
-      apply: async ({g, context, fragmentMapper}) => {
+      apply: async ({g, context}) => {
         // From 
         //    [{"property":"canSubject"},{"property":"operator","number":"canSubject"},{"property":"canObject"}]
         for (const element of propertyToArray(context)) {

package/common/comparable.instance.json

@@ -1339,8 +1339,7 @@
               "queryable",
               "unknown"
             ],
-            "level": 0,
-            "evaluate": false
+            "level": 0
           },
           "two": {
             "value": "concepts",
@@ -1627,8 +1626,7 @@
               "queryable",
               "unknown"
             ],
-            "level": 0,
-            "evaluate": false
+            "level": 0
           },
           "two": {
             "value": "condition",
@@ -2200,8 +2198,7 @@
                 "types": [
                   "unknown"
                 ],
-                "level": 0,
-                "evaluate": false
+                "level": 0
               },
               {
                 "value": "lowest",
@@ -2232,8 +2229,7 @@
                 "types": [
                   "unknown"
                 ],
-                "level": 0,
-                "evaluate": false
+                "level": 0
               },
               {
                 "value": "maximum",
@@ -2249,8 +2245,7 @@
                 "types": [
                   "unknown"
                 ],
-                "level": 0,
-                "evaluate": false
+                "level": 0
               },
               {
                 "value": "minimum",
@@ -2266,8 +2261,7 @@
                 "types": [
                   "unknown"
                 ],
-                "level": 0,
-                "evaluate": false
+                "level": 0
               }
             ],
             "level": 1

package/common/conjunction.js

@@ -42,10 +42,10 @@ const config = {
       where: where(),
       semantic: {
         match: ({context, namespaced}) => !namespaced.get('conjunction', context, 'atomic'),
-        apply: async ({context, flatten, s}) => {
+        apply: async ({context, flatten, e}) => {
           for (const value of flatten(context)) {
             value.topLevel = context.topLevel;
-            await s(value)
+            await e(value, where())
           }
         }
       }
@@ -55,11 +55,11 @@ const config = {
     {
       where: where(),
       notes: 'evaluate elements of the list individually',
-      match: ({context, callId}) => context.marker == 'list' && context.evaluate,
+      match: ({context, callId}) => context.marker == 'list' && !context.topLevel,
       apply: async ({context, toArray, toList, e, resolveEvaluate}) => {
         const list = []
         for (const element of toArray(context)) {
-          list.push(await e(element))
+          list.push(await e(element, where()))
         }
         resolveEvaluate(context, toList(list))
       }

package/common/dateTimeSelectors.instance.json

@@ -68,7 +68,7 @@
       "semantics": [
         {
           "match": "({context, isA}) => onOrIs('dayAfterDate', context)",
-          "apply": "async ({context, isProcess, isTest, kms, isA, e}) => {\n            try {\n              const now = kms.time.api.now()\n              const date = afterOrIs('dayAfterDate', context)\n              const afterISO = (await e(date.after)).evalue\n              const day_ordinal = date.day.day_ordinal\n              const ordinal = date.day.ordinal.value\n              context.evalue = dateTimeSelectors_helpers.getNthWeekdayAfterDate(afterISO, day_ordinal, ordinal)\n            } catch ( e ) {\n              context.evalue = `Implement instatiate for this type of date, ${context.marker}. See the dateTimeSelectors KM ${where()}. ${e}`\n            }\n          }"
+          "apply": "async ({context, isProcess, isTest, kms, isA, e}) => {\n            try {\n              const now = kms.time.api.now()\n              const date = afterOrIs('dayAfterDate', context)\n              const afterISO = (await e(date.after, where())).evalue\n              const day_ordinal = date.day.day_ordinal\n              const ordinal = date.day.ordinal.value\n              context.evalue = dateTimeSelectors_helpers.getNthWeekdayAfterDate(afterISO, day_ordinal, ordinal)\n            } catch ( e ) {\n              context.evalue = `Implement instatiate for this type of date, ${context.marker}. See the dateTimeSelectors KM ${where()}. ${e}`\n            }\n          }"
         },
         {
           "match": "({context, isA}) => onOrIs('dayOfMonth', context)",

package/common/dateTimeSelectors.js

@@ -99,7 +99,7 @@ const template = {
             try {
               const now = kms.time.api.now()
               const date = afterOrIs('dayAfterDate', context)
-              const afterISO = (await e(date.after)).evalue
+              const afterISO = (await e(date.after, where())).evalue
               const day_ordinal = date.day.day_ordinal
               const ordinal = date.day.ordinal.value
               context.evalue = dateTimeSelectors_helpers.getNthWeekdayAfterDate(afterISO, day_ordinal, ordinal)

package/common/dates.instance.json

@@ -341,7 +341,7 @@
           "isA": [
             "date_dates"
           ],
-          "evaluator": "({context}) => {\n            const year = context.year.value\n            const day = context.day.value\n            const month_ordinal = context.month.month_ordinal\n            context.evalue = new Date(year, month_ordinal-1, day).toISOString()\n          }",
+          "semantic": "({context}) => {\n            const year = context.year.value\n            const day = context.day.value\n            const month_ordinal = context.month.month_ordinal\n            context.evalue = new Date(year, month_ordinal-1, day).toISOString()\n          }",
           "localHierarchy": [
             [
               "ordinal",

package/common/dates.js

@@ -192,7 +192,7 @@ const template = {
           convolution: true,
           before: ['preposition', 'monthDay_dates'],
           isA: ['date_dates'],
-          evaluator: ({context}) => {
+          semantic: ({context}) => {
             const year = context.year.value
             const day = context.day.value
             const month_ordinal = context.month.month_ordinal