tpmkms_4wp 9.3.0-beta.9 → 9.4.0

package/common/pressure.instance.json

@@ -243,11 +243,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -1675,11 +1670,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -3635,11 +3625,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -5311,11 +5296,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",

package/common/pressure.js

@@ -24,8 +24,8 @@ knowledgeModule({
     name: './pressure.test.json',
     contents: pressure_tests,
     checks: {
-            context: defaultContextCheck(),
-          },
+      context: [defaultContextCheck()],
+    },
   },
   template: {
     template,

package/common/properties.instance.json

@@ -59,11 +59,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",

package/common/properties.js

@@ -432,9 +432,9 @@ const config = {
     {
       where: where(),
       match: ({context}) => context.marker == 'concept' && context.same,
-      apply: (args) => {
+      apply: async (args) => {
         const {context} = args
-        args.makeObject({ ...args, context: context.same })
+        await args.makeObject({ ...args, context: context.same })
         context.sameWasProcessed = true
       }
     },
@@ -550,8 +550,8 @@ const config = {
         const propertyContext = context;
         const objectId = context.object.value
 
-        api.makeObject({ ...args, context: objectContext })
-        api.makeObject({ ...args, context: propertyContext })
+        await api.makeObject({ ...args, context: objectContext })
+        await api.makeObject({ ...args, context: propertyContext })
         // const propertyId = context.value
         /*
         const propertyId = context.marker
@@ -695,15 +695,13 @@ knowledgeModule( {
     name: './properties.test.json',
     contents: properties_tests,
     checks: {
-      context: defaultContextCheck(),
-      /*
-      objects: [
-        'children', 
-        'concept', 
-        'parents', 
-        'properties'
-      ]
-      */
+      context: [
+        defaultContextCheck({ marker: 'property', exported: true, extra: ['object', 'objects'] }),
+        defaultContextCheck({ marker: 'possession', exported: true, extra: ['object', 'objects'] }),
+        defaultContextCheck({ marker: 'propertyOf', exported: true, extra: ['object', 'objects'] }),
+        defaultContextCheck({ marker: 'objectPrefix', exported: true, extra: ['object', 'objects'] }),
+        defaultContextCheck()
+      ],
     },
     include: {
       words: true,

package/common/punctuation.js

@@ -71,8 +71,8 @@ knowledgeModule( {
     name: './punctuation.test.json',
     contents: punctuation_tests,
     checks: {
-            context: defaultContextCheck(),
-          },
+      context: [defaultContextCheck()],
+    },
   },
 })
 

package/common/reminders.instance.json

@@ -2,35 +2,94 @@
   "configs": [
     {
       "operators": [
-        "([reminderTime|])",
-        "([remind] (self/*) (!@<= 'onDate')*)",
-        "([remind:withTimeBridge] (self/*) (!@<= 'onDate')* ([onDate|on] (reminderTime)))",
+        "([remindable])",
+        {
+          "pattern": "([addRemindable] (word)*)",
+          "development": true
+        },
+        "([remind:justWhoBridge] (remindable/*))",
+        "([remind] (remindable/*) (!@<= 'dateTimeSelector' && !@<= 'inAddition')*)",
+        "([remind:withDateBridge] (remindable/*) (!@<= 'dateTimeSelector' && !@<= 'inAddition')* (dateTimeSelector))",
+        "([remind:withDateFirstBridge] (remindable/*) (dateTimeSelector) (!@<= 'dateTimeSelector' && !@<= 'inAddition')*)",
+        "([remind:withDateAndTimeBridge] (remindable/*) (!@<= 'dateTimeSelector' && !@<= 'inAddition')* (dateTimeSelector) (atTime))",
+        "([remindResponse] (!@<= 'remindResponse' && !@<= 'dateTimeSelector' && !@<= 'inAddition')+ (dateTimeSelector))",
         "([show] ([reminders]))",
-        "([delete_reminders|delete,cancel] (number/*))"
+        "([delete_reminders|delete,cancel] (number/*))",
+        "([add] (remindable/*))",
+        "([remove|] (remindable/*))",
+        "((verb/*) [inAddition|also,too])"
       ],
       "bridges": [
         {
-          "id": "remind",
+          "id": "inAddition",
+          "after": [
+            "verb"
+          ],
+          "bridge": "{ ...before[0], inAddition: true, verb: before[0], operator: operator, interpolate: '${verb} ${operator}' }"
+        },
+        {
+          "id": "add",
           "isA": [
             "verb"
           ],
-          "bridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], interpolate: '${operator} ${who} ${reminder}' }",
-          "withTimeBridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], when: after[2], interpolate: '${operator} ${who} ${reminder} ${when}' }",
-          "semantic": "async ({api, gsp, context}) => {\n            const text = await gsp(context.reminder.slice(1));\n            api.add({ text, when: context.when });\n          }"
+          "bridge": "{ ...next(operator), arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
+          "semantic": "({api, context}) => {\n            api.addUser(api.contextToWho(context.arg))\n          }"
         },
         {
-          "id": "reminderTime",
-          "children": [
-            "day_dates",
-            "month_dates"
+          "id": "remove",
+          "words": [
+            "delete",
+            "remove"
+          ],
+          "isA": [
+            "verb"
+          ],
+          "bridge": "{ ...next(operator), arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
+          "semantic": "({api, context}) => {\n            api.removeUser(api.contextToWho(context.arg))\n          }"
+        },
+        {
+          "id": "addRemindable",
+          "isA": [
+            "verb"
+          ],
+          "development": true,
+          "bridge": "{ ...next(operator), flatten: true, arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
+          "semantic": "async ({api, context}) => {\n            const name = context.arg.map( (word) => word.text ).join(' ')\n            await api.addRemindable(name)\n          }"
+        },
+        {
+          "id": "remindable",
+          "isA": [
+            "listable"
           ]
         },
         {
-          "id": "onDate",
+          "id": "remindResponse",
           "isA": [
-            "preposition"
+            "verb"
           ],
-          "bridge": "{ ...next(operator), time: after[0], onDate: operator, interpolate: '${onDate} ${time}' }"
+          "convolution": true,
+          "disabled": true,
+          "bridge": "{ ...next(operator), operator: operator, reminder: after[0], date: after[1], interpolate: '${reminder} ${date}' }",
+          "semantic": "async ({context, api, gp, gsp}) => {\n            const text = await gsp(context.reminder.slice(0));\n            const update = { text }\n            if (context.date) {\n              update.dateTimeSelector = context.date\n              update.dateTimeSelectorText = await gp(context.date)\n            }\n            await api.update(update)\n          }"
+        },
+        {
+          "id": "remind",
+          "isA": [
+            "verb"
+          ],
+          "localHierarchy": [
+            [
+              "self",
+              "remindable"
+            ]
+          ],
+          "bridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], interpolate: '${operator} ${who} ${reminder}' }",
+          "justWhoBridge": "{ ...next(operator), bridge: 'justWhoBridge', operator: operator, who: after[0], interpolate: '${operator} ${who}' }",
+          "withDateBridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], date: after[2], interpolate: '${operator} ${who} ${reminder} ${date}' }",
+          "withDateFirstBridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[2], date: after[1], interpolate: '${operator} ${who} ${date} ${reminder}' }",
+          "withDateAndTimeBridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], date: after[2], time: after[3], interpolate: '${operator} ${who} ${reminder} ${date} ${time}' }",
+          "semantics": "[object Object]",
+          "semantic": "async ({ask, api, gsp, gp, context}) => {\n            const who = api.contextToWho(context.who)\n            let text;\n            if (context.reminder) {\n              text = await gsp(context.reminder.slice(1));\n            }\n            const reminder = { text, dateTimeSelector: context.date, who }\n            if (context.date) {\n              reminder.dateTimeSelector = context.date\n              reminder.dateTimeSelectorText = await gp(context.date)\n            }\n            // await api.instantiate(reminder)\n            await api.add(reminder)\n            reminder.cleanUp = ask([\n              query('missingReminder', reminder.id),\n              query('missingDate', reminder.id),\n            ])\n          }"
         },
         {
           "id": "reminders",
@@ -55,43 +114,97 @@
           "semantic": "({context, api, verbatim}) => {\n            const s = api.delete_reminder(context.reminders.value)\n            if (s) {\n              verbatim(s)\n            }\n          }"
         }
       ]
-    },
-    {
-      "apply": "({ask, api}) => {\n      ask([\n        {\n          where: where(),\n          oneShot: false,\n          onNevermind: ({verbatim, ...args}) => {\n            // this is cross km boundaries from the dialogues km to this one so the api if for dialogs.\n            // i need to get the one for fastfood here.\n            const api = args.kms.fastfood.api\n            const needsDrink = askAbout({ args, api })\n            for (const item of needsDrink) {\n              api.remove(item)\n            }\n          },\n\n          matchq: ({ api, context }) => api.askAbout().length > 0 && context.marker == 'controlEnd',\n          applyq: ({ api, context }) => {\n            context.cascade = false\n            const items = api.askAbout()\n            const item = items[0]\n            return 'When should I remind you to ' + item.text;\n          },\n\n          matchr: ({ isA, api, context }) => {\n            if (isA(context.marker, 'reminderTime') && api.askAbout().length > 0) {\n                return true\n            }\n            return false\n          },\n          applyr: ({ context, api }) => {\n            const items = api.askAbout()\n            api.update({ id: items[0].id, when: context })\n            // TODO check for is available for all modifications\n            /*\n            const needsDrink = askAbout(args)\n            const { api, context } = args\n            if (isMany(context)) {\n              let count = getCount(context) || Number.MAX_SAFE_INTEGER\n              for (const item of needsDrink) {\n                if (count < 1) {\n                  break\n                }\n                count -= 1\n                api.addDrink(item.item_id, { id: context.value })\n              }\n            } else {\n              const item_id = needsDrink[0].item_id\n              api.addDrink(item_id, { id: context.value })\n            }\n            */\n          }\n        },\n      ])\n    }"
     }
   ],
   "resultss": [
     {
       "extraConfig": true,
       "operators": [
-        "([reminderTime|])",
-        "([remind] (self/*) (!@<= 'onDate')*)",
-        "([remind:withTimeBridge] (self/*) (!@<= 'onDate')* ([onDate|on] (reminderTime)))",
+        "([remindable])",
+        {
+          "pattern": "([addRemindable] (word)*)",
+          "development": true
+        },
+        "([remind:justWhoBridge] (remindable/*))",
+        "([remind] (remindable/*) (!@<= 'dateTimeSelector' && !@<= 'inAddition')*)",
+        "([remind:withDateBridge] (remindable/*) (!@<= 'dateTimeSelector' && !@<= 'inAddition')* (dateTimeSelector))",
+        "([remind:withDateFirstBridge] (remindable/*) (dateTimeSelector) (!@<= 'dateTimeSelector' && !@<= 'inAddition')*)",
+        "([remind:withDateAndTimeBridge] (remindable/*) (!@<= 'dateTimeSelector' && !@<= 'inAddition')* (dateTimeSelector) (atTime))",
+        "([remindResponse] (!@<= 'remindResponse' && !@<= 'dateTimeSelector' && !@<= 'inAddition')+ (dateTimeSelector))",
         "([show] ([reminders]))",
-        "([delete_reminders|delete,cancel] (number/*))"
+        "([delete_reminders|delete,cancel] (number/*))",
+        "([add] (remindable/*))",
+        "([remove|] (remindable/*))",
+        "((verb/*) [inAddition|also,too])"
       ],
       "bridges": [
         {
-          "id": "remind",
+          "id": "inAddition",
+          "after": [
+            "verb"
+          ],
+          "bridge": "{ ...before[0], inAddition: true, verb: before[0], operator: operator, interpolate: '${verb} ${operator}' }"
+        },
+        {
+          "id": "add",
           "isA": [
             "verb"
           ],
-          "bridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], interpolate: '${operator} ${who} ${reminder}' }",
-          "withTimeBridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], when: after[2], interpolate: '${operator} ${who} ${reminder} ${when}' }"
+          "bridge": "{ ...next(operator), arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }"
+        },
+        {
+          "id": "remove",
+          "words": [
+            "delete",
+            "remove"
+          ],
+          "isA": [
+            "verb"
+          ],
+          "bridge": "{ ...next(operator), arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }"
+        },
+        {
+          "id": "addRemindable",
+          "isA": [
+            "verb"
+          ],
+          "development": true,
+          "bridge": "{ ...next(operator), flatten: true, arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }"
         },
         {
-          "id": "reminderTime",
-          "children": [
-            "day_dates",
-            "month_dates"
+          "id": "remindable",
+          "isA": [
+            "listable"
           ]
         },
         {
-          "id": "onDate",
+          "id": "remindResponse",
           "isA": [
-            "preposition"
+            "verb"
           ],
-          "bridge": "{ ...next(operator), time: after[0], onDate: operator, interpolate: '${onDate} ${time}' }"
+          "convolution": true,
+          "disabled": true,
+          "bridge": "{ ...next(operator), operator: operator, reminder: after[0], date: after[1], interpolate: '${reminder} ${date}' }"
+        },
+        {
+          "id": "remind",
+          "isA": [
+            "verb"
+          ],
+          "localHierarchy": [
+            [
+              "self",
+              "remindable"
+            ]
+          ],
+          "bridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], interpolate: '${operator} ${who} ${reminder}' }",
+          "justWhoBridge": "{ ...next(operator), bridge: 'justWhoBridge', operator: operator, who: after[0], interpolate: '${operator} ${who}' }",
+          "withDateBridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], date: after[2], interpolate: '${operator} ${who} ${reminder} ${date}' }",
+          "withDateFirstBridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[2], date: after[1], interpolate: '${operator} ${who} ${date} ${reminder}' }",
+          "withDateAndTimeBridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], date: after[2], time: after[3], interpolate: '${operator} ${who} ${reminder} ${date} ${time}' }",
+          "semantics": [
+            {}
+          ]
         },
         {
           "id": "reminders",
@@ -114,9 +227,6 @@
           "bridge": "{ ...next(operator), operator: operator, reminders: after[0], interpolate: '${operator} ${reminders}' }"
         }
       ]
-    },
-    {
-      "apply": "({ask, api}) => {\n      ask([\n        {\n          where: where(),\n          oneShot: false,\n          onNevermind: ({verbatim, ...args}) => {\n            // this is cross km boundaries from the dialogues km to this one so the api if for dialogs.\n            // i need to get the one for fastfood here.\n            const api = args.kms.fastfood.api\n            const needsDrink = askAbout({ args, api })\n            for (const item of needsDrink) {\n              api.remove(item)\n            }\n          },\n\n          matchq: ({ api, context }) => api.askAbout().length > 0 && context.marker == 'controlEnd',\n          applyq: ({ api, context }) => {\n            context.cascade = false\n            const items = api.askAbout()\n            const item = items[0]\n            return 'When should I remind you to ' + item.text;\n          },\n\n          matchr: ({ isA, api, context }) => {\n            if (isA(context.marker, 'reminderTime') && api.askAbout().length > 0) {\n                return true\n            }\n            return false\n          },\n          applyr: ({ context, api }) => {\n            const items = api.askAbout()\n            api.update({ id: items[0].id, when: context })\n            // TODO check for is available for all modifications\n            /*\n            const needsDrink = askAbout(args)\n            const { api, context } = args\n            if (isMany(context)) {\n              let count = getCount(context) || Number.MAX_SAFE_INTEGER\n              for (const item of needsDrink) {\n                if (count < 1) {\n                  break\n                }\n                count -= 1\n                api.addDrink(item.item_id, { id: context.value })\n              }\n            } else {\n              const item_id = needsDrink[0].item_id\n              api.addDrink(item_id, { id: context.value })\n            }\n            */\n          }\n        },\n      ])\n    }"
     }
   ],
   "fragments": [],