tpmkms_4wp 9.3.0-beta.21 → 9.3.0-beta.23

package/common/fastfood.instance.json

@@ -89995,6 +89995,42 @@
             0
           ]
         ],
+        [
+          [
+            "list",
+            1
+          ],
+          [
+            "modifies",
+            0
+          ],
+          [
+            "strawberry",
+            0
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
+        [
+          [
+            "list",
+            1
+          ],
+          [
+            "modifies",
+            0
+          ],
+          [
+            "strawberry",
+            0
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "list",
@@ -110414,6 +110450,24 @@
             0
           ]
         ],
+        [
+          [
+            "ingredient",
+            0
+          ],
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "smoothie",
+            0
+          ]
+        ],
         [
           [
             "ingredient",
@@ -347771,6 +347825,24 @@
             0
           ]
         ],
+        [
+          [
+            "breakfast",
+            0
+          ],
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "meal",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -362097,6 +362169,20 @@
             1
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "meal",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -573379,6 +573465,24 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "kid",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "meal",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -595815,6 +595919,60 @@
             0
           ]
         ],
+        [
+          [
+            "bacon",
+            0
+          ],
+          [
+            "cheeseburger",
+            0
+          ],
+          [
+            "chicken",
+            0
+          ],
+          [
+            "club",
+            0
+          ],
+          [
+            "comma",
+            0
+          ],
+          [
+            "crispy",
+            0
+          ],
+          [
+            "go",
+            0
+          ],
+          [
+            "is",
+            0
+          ],
+          [
+            "junior",
+            0
+          ],
+          [
+            "list",
+            0
+          ],
+          [
+            "meal",
+            0
+          ],
+          [
+            "value",
+            0
+          ],
+          [
+            "wrap",
+            0
+          ]
+        ],
         [
           [
             "chicken",
@@ -595937,6 +596095,40 @@
             0
           ]
         ],
+        [
+          [
+            "chicken",
+            0
+          ],
+          [
+            "club",
+            0
+          ],
+          [
+            "crispy",
+            0
+          ],
+          [
+            "is",
+            0
+          ],
+          [
+            "junior",
+            0
+          ],
+          [
+            "list",
+            0
+          ],
+          [
+            "meal",
+            0
+          ],
+          [
+            "value",
+            0
+          ]
+        ],
         [
           [
             "chicken",
@@ -610048,6 +610240,60 @@
         0
       ]
     ],
+    [
+      [
+        "bacon",
+        0
+      ],
+      [
+        "cheeseburger",
+        0
+      ],
+      [
+        "chicken",
+        0
+      ],
+      [
+        "club",
+        0
+      ],
+      [
+        "comma",
+        0
+      ],
+      [
+        "crispy",
+        0
+      ],
+      [
+        "go",
+        0
+      ],
+      [
+        "is",
+        0
+      ],
+      [
+        "junior",
+        0
+      ],
+      [
+        "list",
+        0
+      ],
+      [
+        "meal",
+        0
+      ],
+      [
+        "value",
+        0
+      ],
+      [
+        "wrap",
+        0
+      ]
+    ],
     [
       [
         "bacon",
@@ -611444,6 +611690,24 @@
         0
       ]
     ],
+    [
+      [
+        "breakfast",
+        0
+      ],
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "meal",
+        0
+      ]
+    ],
     [
       [
         "breakfast",
@@ -611930,6 +612194,40 @@
         0
       ]
     ],
+    [
+      [
+        "chicken",
+        0
+      ],
+      [
+        "club",
+        0
+      ],
+      [
+        "crispy",
+        0
+      ],
+      [
+        "is",
+        0
+      ],
+      [
+        "junior",
+        0
+      ],
+      [
+        "list",
+        0
+      ],
+      [
+        "meal",
+        0
+      ],
+      [
+        "value",
+        0
+      ]
+    ],
     [
       [
         "chicken",
@@ -613372,6 +613670,24 @@
         0
       ]
     ],
+    [
+      [
+        "ingredient",
+        0
+      ],
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "smoothie",
+        0
+      ]
+    ],
     [
       [
         "ingredient",
@@ -613434,6 +613750,24 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "kid",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "meal",
+        0
+      ]
+    ],
     [
       [
         "is",
@@ -613616,6 +613950,20 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "meal",
+        0
+      ]
+    ],
     [
       [
         "is",
@@ -613984,6 +614332,42 @@
         0
       ]
     ],
+    [
+      [
+        "list",
+        1
+      ],
+      [
+        "modifies",
+        0
+      ],
+      [
+        "strawberry",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "list",
+        1
+      ],
+      [
+        "modifies",
+        0
+      ],
+      [
+        "strawberry",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "list",

package/common/helpers/dateTimeSelectors.js

@@ -48,12 +48,7 @@ function getTime(time) {
 }
 
 instantiate = (now, context) => {
-  if (context.dateTimeSelector) {
-    const dateTimeSelector = getNextDayOfWeek(now, context.dateTimeSelector?.value)
-    if (dateTimeSelector) {
-      return dateTimeSelector.toISOString()
-    }
-  } else if (context.marker == 'dateTimeSelector') {
+  if (context.marker == 'dateTimeSelector') {
     // (on date) OR (date)
     const date = context.date?.date || context.date
     const dateTimeSelector = getNextDayOfWeek(now, date.value)
@@ -63,6 +58,16 @@ instantiate = (now, context) => {
     dateTimeSelector.setSeconds(hms.second)
     dateTimeSelector.setMilliseconds(0)
     return dateTimeSelector.toISOString()
+  } else if (context.dateTimeSelector) {
+    const dateTimeSelector = getNextDayOfWeek(now, context.dateTimeSelector?.value)
+    if (dateTimeSelector) {
+      return dateTimeSelector.toISOString()
+    }
+  } else if (context.value) {
+    const dateTimeSelector = getNextDayOfWeek(now, context.value)
+    if (dateTimeSelector) {
+      return dateTimeSelector.toISOString()
+    }
   }
 }
 

package/common/pipboy.instance.json

@@ -1713,6 +1713,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -10182,6 +10196,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -35613,6 +35641,34 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "is",

package/common/reminders.instance.json

@@ -40,7 +40,7 @@
           "bridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], interpolate: '${operator} ${who} ${reminder}' }",
           "withDateBridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], date: after[2], interpolate: '${operator} ${who} ${reminder} ${date}' }",
           "withDateAndTimeBridge": "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], date: after[2], time: after[3], interpolate: '${operator} ${who} ${reminder} ${date} ${time}' }",
-          "semantic": "async ({api, gsp, gp, context}) => {\n            const text = await gsp(context.reminder.slice(1));\n            const reminder = { text, dateTimeSelector: context.date }\n            if (context.date) {\n              reminder.dateTimeSelector = context.date\n              reminder.dateTimeSelectorText = await gp(context.date)\n            }\n            await api.instantiate(reminder)\n            api.add(reminder)\n          }"
+          "semantic": "async ({api, gsp, gp, context}) => {\n            const text = await gsp(context.reminder.slice(1));\n            const who = { id: context.who.value || context.who.text, text: context.who.text }\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          }"
         },
         {
           "id": "reminders",
@@ -67,7 +67,7 @@
       ]
     },
     {
-      "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, 'onDateValue_dates') && api.askAbout().length > 0) {\n                return true\n            }\n            return false\n          },\n          applyr: async ({ context, api, gp }) => {\n            const items = api.askAbout()\n            api.update({ id: items[0].id, dateTimeSelector: context, dateTimeSelectorText: await gp(context) })\n          }\n        },\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, 'onDateValue_dates') || isA(context.marker, 'dateTimeSelector')) && api.askAbout().length > 0) {\n                return true\n            }\n            return false\n          },\n          applyr: async ({ context, api, gp }) => {\n            const items = api.askAbout()\n            await api.update({ id: items[0].id, dateTimeSelector: context, dateTimeSelectorText: await gp(context) })\n          }\n        },\n      ])\n    }"
     }
   ],
   "resultss": [
@@ -135,7 +135,7 @@
       ]
     },
     {
-      "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, 'onDateValue_dates') && api.askAbout().length > 0) {\n                return true\n            }\n            return false\n          },\n          applyr: async ({ context, api, gp }) => {\n            const items = api.askAbout()\n            api.update({ id: items[0].id, dateTimeSelector: context, dateTimeSelectorText: await gp(context) })\n          }\n        },\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, 'onDateValue_dates') || isA(context.marker, 'dateTimeSelector')) && api.askAbout().length > 0) {\n                return true\n            }\n            return false\n          },\n          applyr: async ({ context, api, gp }) => {\n            const items = api.askAbout()\n            await api.update({ id: items[0].id, dateTimeSelector: context, dateTimeSelectorText: await gp(context) })\n          }\n        },\n      ])\n    }"
     }
   ],
   "fragments": [],

package/common/reminders.js

@@ -16,9 +16,6 @@ const helpers = require('./helpers')
    remind greg to go to regina
    remind every truck driver to whatever tomorrow at 8 am
    remind greg and bob to go to bolivia and see the xyz corporation
-
-   remind me to go\nmonday at 10 am
-   remind me to go\non monday at 10 am
 */
 
 class API {
@@ -28,7 +25,8 @@ class API {
     this._objects.id = 0
   }
 
-  add(reminder) {
+  async add(reminder) {
+    await this.instantiate(reminder)
     const id = ++this._objects.id
     reminder.id = id
     this._objects.reminders.push(reminder)
@@ -82,10 +80,11 @@ class API {
     this._objects.reminders = this._objects.reminders.splice(ordinal, 1)
   }
 
-  update(update) {
+  async update(update) {
     for (const item of this._objects.reminders) {
       if (item.id == update.id) {
         Object.assign(item, update)
+        await this.instantiate(item)
         return
       }
     }
@@ -113,7 +112,7 @@ const template = {
           id: 'addRemindable',
           isA: ['verb'],
           development: true,
-          bridge: "{ ...next(operator), arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
+          bridge: "{ ...next(operator), flatten: true, arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
           semantic: ({api, context}) => {
             const name = context.arg.map( (word) => word.text ).join(' ')
             api.addRemindable(name)
@@ -137,8 +136,8 @@ const template = {
               reminder.dateTimeSelector = context.date
               reminder.dateTimeSelectorText = await gp(context.date)
             }
-            await api.instantiate(reminder)
-            api.add(reminder)
+            // await api.instantiate(reminder)
+            await api.add(reminder)
           },
         },
         { 
@@ -197,7 +196,7 @@ const template = {
           },
           applyr: async ({ context, api, gp }) => {
             const items = api.askAbout()
-            api.update({ id: items[0].id, dateTimeSelector: context, dateTimeSelectorText: await gp(context) })
+            await api.update({ id: items[0].id, dateTimeSelector: context, dateTimeSelectorText: await gp(context) })
           }
         },
       ])
@@ -223,13 +222,13 @@ knowledgeModule( {
           filter: [ 
             'text', 
             'dateTimeSelectorText', 
-            'who',
             'nextISODate', 
+            'who', 
             'stm',
             {
               property: 'dateTimeSelector', 
               filter: ['marker', 'text', 'value'],
-            }
+            },
           ],
         }
       ],