tpmkms 9.8.0 → 9.9.0

package/common/punctuation.js

@@ -53,6 +53,7 @@ const config = {
     },
     {
       id: "doubleQuote",
+      where: where(),
       level: 0,
       bridge: "{ ...next(operator), quote: 'double' }",
       enhanced_associations: false,

package/common/rates.instance.json

@@ -19,8 +19,8 @@
       ],
       "semantics": [
         {
-          "match": "({context}) => context.marker == 'convertToUnits' && context.evaluate && (context.from?.unit?.marker == 'unitPerUnit' || context.to.marker == 'unitPerUnit')",
-          "apply": "async ({remember, context, kms, e, callId, resolveEvaluate, toEValue, error}) => {\n\n            async function convert(fromUnits, fromAmount, toUnits) {\n              let evalue;\n              if (toUnits.value == fromUnits.value) {\n                evalue = fromAmount\n                // if (!fromAmount.value) {\n                //  debugger\n                //}\n                evalue.evalue = fromAmount.evalue || fromAmount.value\n              } else {\n                const formula = kms.formulas.api.get(toUnits, [fromUnits])\n                if (!formula) {\n                  const reason = { marker: 'reason', focusableForPhrase: true, evalue: { marker: 'noconversion', from: fromUnits, to: toUnits } }\n                  kms.stm.api.remember({ context: reason })\n                  error(reason)\n                }\n                kms.stm.api.setVariable(fromUnits.value, fromAmount)\n                evalue = await e(formula)\n              }\n              return evalue\n            }\n\n            if (!context.from.unit) {\n              resolveEvaluate(context.from, await e(context.from))\n            }\n\n\n            const from = toEValue(context.from)\n            remember(context.to)\n            const evalueNumerator = await convert(from.unit.numerator, from.amount, context.to.numerator)\n            const evalueDenominator = await convert(from.unit.denominator, 1, context.to.denominator)\n            const evalue = { evalue: (toFinalValue(evalueNumerator) || evalueNumerator.value) / (toFinalValue(evalueDenominator) || evalueDenominator.evalue) }\n            context.evalue = {\n              paraphrase: true,\n              marker: 'quantity',\n              level: 1,\n              unit: context.to,\n              amount: { evalue, paraphrase: undefined }\n            }\n          }"
+          "match": "({context}) => context.marker == 'convertToUnits' && (context.from?.unit?.marker == 'unitPerUnit' || context.to.marker == 'unitPerUnit')",
+          "apply": "async ({remember, context, kms, e, callId, resolveEvaluate, toEValue, error}) => {\n\n            async function convert(fromUnits, fromAmount, toUnits) {\n              let evalue;\n              if (toUnits.value == fromUnits.value) {\n                evalue = fromAmount\n                // if (!fromAmount.value) {\n                //  debugger\n                //}\n                evalue.evalue = fromAmount.evalue || fromAmount.value\n              } else {\n                const formula = kms.formulas.api.get(toUnits, [fromUnits])\n                if (!formula) {\n                  const reason = { marker: 'reason', focusableForPhrase: true, evalue: { marker: 'noconversion', from: fromUnits, to: toUnits } }\n                  kms.stm.api.remember({ context: reason })\n                  error(reason)\n                }\n                kms.stm.api.setVariable(fromUnits.value, fromAmount)\n                evalue = await e(formula, where())\n              }\n              return evalue\n            }\n\n            if (!context.from.unit) {\n              resolveEvaluate(context.from, await e(context.from, where()))\n            }\n\n\n            const from = toEValue(context.from)\n            remember(context.to)\n            const evalueNumerator = await convert(from.unit.numerator, from.amount, context.to.numerator)\n            const evalueDenominator = await convert(from.unit.denominator, 1, context.to.denominator)\n            const evalue = { evalue: (toFinalValue(evalueNumerator) || evalueNumerator.value) / (toFinalValue(evalueDenominator) || evalueDenominator.evalue) }\n            context.evalue = {\n              paraphrase: true,\n              marker: 'quantity',\n              level: 1,\n              unit: context.to,\n              amount: { evalue, paraphrase: undefined }\n            }\n          }"
         }
       ]
     }

package/common/rates.js

@@ -36,7 +36,7 @@ const template = {
       semantics: [
         {
           where: where(),
-          match: ({context}) => context.marker == 'convertToUnits' && context.evaluate && (context.from?.unit?.marker == 'unitPerUnit' || context.to.marker == 'unitPerUnit'),
+          match: ({context}) => context.marker == 'convertToUnits' && (context.from?.unit?.marker == 'unitPerUnit' || context.to.marker == 'unitPerUnit'),
           apply: async ({remember, context, kms, e, callId, resolveEvaluate, toEValue, error}) => {
 
             async function convert(fromUnits, fromAmount, toUnits) {
@@ -55,13 +55,13 @@ const template = {
                   error(reason)
                 }
                 kms.stm.api.setVariable(fromUnits.value, fromAmount)
-                evalue = await e(formula)
+                evalue = await e(formula, where())
               }
               return evalue
             }
 
             if (!context.from.unit) {
-              resolveEvaluate(context.from, await e(context.from))
+              resolveEvaluate(context.from, await e(context.from, where()))
             }
 
 

package/common/reminders.instance.json

@@ -30,6 +30,7 @@
         },
         {
           "id": "add",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:263",
           "isA": [
             "verb"
           ],
@@ -38,6 +39,7 @@
         },
         {
           "id": "remove",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:272",
           "words": [
             "delete",
             "remove"
@@ -50,6 +52,7 @@
         },
         {
           "id": "addRemindable",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:282",
           "isA": [
             "verb"
           ],
@@ -65,6 +68,7 @@
         },
         {
           "id": "remindResponseOnly",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:297",
           "isA": [
             "verb"
           ],
@@ -75,6 +79,7 @@
         },
         {
           "id": "remindResponse",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:314",
           "before": [
             "remindResponseOnly"
           ],
@@ -91,6 +96,7 @@
         },
         {
           "id": "remind",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:335",
           "isA": [
             "verb"
           ],
@@ -116,6 +122,7 @@
         },
         {
           "id": "show",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:376",
           "isA": [
             "verb"
           ],
@@ -124,6 +131,7 @@
         },
         {
           "id": "delete_reminders",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:385",
           "isA": [
             "verb"
           ],
@@ -165,6 +173,7 @@
         },
         {
           "id": "add",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:263",
           "isA": [
             "verb"
           ],
@@ -172,6 +181,7 @@
         },
         {
           "id": "remove",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:272",
           "words": [
             "delete",
             "remove"
@@ -183,6 +193,7 @@
         },
         {
           "id": "addRemindable",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:282",
           "isA": [
             "verb"
           ],
@@ -197,6 +208,7 @@
         },
         {
           "id": "remindResponseOnly",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:297",
           "isA": [
             "verb"
           ],
@@ -206,6 +218,7 @@
         },
         {
           "id": "remindResponse",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:314",
           "before": [
             "remindResponseOnly"
           ],
@@ -221,6 +234,7 @@
         },
         {
           "id": "remind",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:335",
           "isA": [
             "verb"
           ],
@@ -247,6 +261,7 @@
         },
         {
           "id": "show",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:376",
           "isA": [
             "verb"
           ],
@@ -254,6 +269,7 @@
         },
         {
           "id": "delete_reminders",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/reminders.js:385",
           "isA": [
             "verb"
           ],

package/common/reminders.js

@@ -1,4 +1,4 @@
-const { knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where, debug } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const reminders_tests = require('./reminders.test.json')
 const instance = require('./reminders.instance.json')
@@ -49,11 +49,6 @@ function query(missing, reminder_id) {
         enable(['remindResponseOnly', 0])
       }
 
-      /*
-      if (item.missingDate && item.missingReminder) {
-        enable(['remindResponse', 0])
-      }
-      */
       if (item.missingDate && missing == 'missingDate') {
         return `When should I remind ${who} to ${item.text}`
       }
@@ -64,7 +59,7 @@ function query(missing, reminder_id) {
     },
 
     matchr: async ({ isA, api, context }) => {
-      if (context.evaluate || context.isControl || context.isResponse) {
+      if (context.isControl || context.isResponse) {
         return false
       }
       const gotADate = ((isA(context.marker, 'onDateValue_dates') || isA(context.marker, 'dateTimeSelector')) && api.missing(missing, reminder_id))
@@ -85,6 +80,7 @@ function query(missing, reminder_id) {
         await api.update({ id: item.id, text })
       } else {
         const item = api.missing(missing, reminder_id)
+        context.topLevel = false
         await api.update({ id: item.id, dateTimeSelector: context, dateTimeSelectorText: await gp(context) })
       }
     }
@@ -264,6 +260,7 @@ const template = {
         },
         {
           id: 'add',
+          where: where(),
           isA: ['verb'],
           bridge: "{ ...next(operator), complete: true, arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
           semantic: ({api, context}) => {
@@ -272,6 +269,7 @@ const template = {
         },
         {
           id: 'remove',
+          where: where(),
           words: ['delete', 'remove'],
           isA: ['verb'],
           bridge: "{ ...next(operator), complete: true, arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
@@ -281,6 +279,7 @@ const template = {
         },
         {
           id: 'addRemindable',
+          where: where(),
           isA: ['verb'],
           scope: "testing",
           bridge: "{ ...next(operator), complete: true, flatten: true, arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
@@ -295,6 +294,7 @@ const template = {
         },
         {
           id: 'remindResponseOnly',
+          where: where(),
           isA: ['verb'],
           convolution: true,
           disabled: true,
@@ -311,6 +311,7 @@ const template = {
         },
         {
           id: 'remindResponse',
+          where: where(),
           before: ['remindResponseOnly'],
           isA: ['verb'],
           convolution: true,
@@ -331,6 +332,7 @@ const template = {
         },
         {
           id: 'remind',
+          where: where(),
           isA: ['verb'],
           localHierarchy: [['self', 'remindable']],
           bridge: "{ ...next(operator), complete: true, operator: operator, who: after[0], reminder: after[1], interpolate: '${operator} ${who} ${reminder}' }",
@@ -371,6 +373,7 @@ const template = {
         },
         {
           id: 'show',
+          where: where(),
           isA: ['verb'],
           bridge: "{ ...next(operator), operator: operator, complete: true, reminders: after[0], interpolate: '${operator} ${reminders}' }",
           semantic: ({context, api, verbatim}) => {
@@ -379,6 +382,7 @@ const template = {
         },
         {
           id: 'delete_reminders',
+          where: where(),
           isA: ['verb'],
           bridge: "{ ...next(operator), operator: operator, complete: true, reminders: after[0], interpolate: '${operator} ${reminders}' }",
           semantic: ({context, api, verbatim}) => {
@@ -412,22 +416,22 @@ knowledgeModule( {
     name: './reminders.test.json',
     contents: reminders_tests,
     checks: {
-      context: [defaultContextCheck({ extra: ['who', 'reminder'] })],
+      context: [
+        {
+          match: ({ path, pathEquals }) => pathEquals(path, ['reminders', '*']),
+          apply: () => ['dateTimeSelector', 'text', 'nextISODate', 'who', 'reminder'],
+        },
+      ],
       objects: [
         { 
           property: 'reminders',
-          check: [ 
-            'text', 
-            'dateTimeSelectorText', 
-            'nextISODate', 
-            'who', 
-            'stm',
-            {
-              property: 'dateTimeSelector', 
-              check: ['marker', 'text', 'value'],
-            },
-          ],
-        }
+          check: [
+            { 
+              property: (key) => typeof key == 'number',
+              check: ['text', 'who', 'dateTimeSelector', 'dateTimeSelectorText', 'nextISODate', 'id'],
+            }
+          ]
+        },
       ],
     },
   },