tpmkms_4wp 9.3.0-beta.7 → 9.3.0-beta.9

package/common/helpers/reminders.js

@@ -0,0 +1,48 @@
+const pluralize = require('pluralize')
+const deepEqual = require('deep-equal')
+const { chooseNumber, zip } = require('../helpers.js')
+const { compose, translationMapping, translationMappingToInstantiatorMappings } = require('./meta.js')
+
+function getNextDayOfWeek(date, targetDay) {
+  const dayMap = {
+    'sunday_dates': 0,
+    'monday_dates': 1,
+    'tuesday_dates': 2,
+    'wednesday_dates': 3,
+    'thursday_dates': 4,
+    'friday_dates': 5,
+    'saturday_dates': 6
+  };
+
+  const targetDayNum = dayMap[targetDay.toLowerCase()]
+  if (!targetDayNum) {
+    return
+  }
+  const currentDay = date.getDay();
+
+  let daysUntilNext = targetDayNum - currentDay;
+  if (daysUntilNext <= 0) {
+    daysUntilNext += 7; // If target day is today or past, get next week's occurrence
+  }
+
+  const nextDate = new Date(date);
+  nextDate.setDate(date.getDate() + daysUntilNext);
+  return nextDate;
+}
+
+instantiate = (now, context) => {
+  if (context.date) {
+    const date = getNextDayOfWeek(now, context.date?.date?.value)
+    if (date) {
+      return date.toISOString()
+    }
+  }
+}
+
+until = (time) => {
+}
+
+module.exports = {
+  instantiate,
+  until,
+}

package/common/reminders.js

@@ -5,6 +5,7 @@ const reminders_instance = require('./reminders.instance.json')
 const selfKM = require('./self')
 const dates = require('./dates')
 const time = require('./time')
+const reminders_helpers = require('./helpers/reminders')
 const helpers = require('./helpers')
 
 class API {
@@ -16,7 +17,24 @@ class API {
 
   add(reminder) {
     const id = ++this._objects.id
-    this._objects.reminders.push({ ...reminder, id })
+    reminder.id = id
+    this._objects.reminders.push(reminder)
+    this.args.mentioned({ context: reminder })
+  }
+
+  instantiate(reminder) {
+    let now;
+    if (this.args.isProcess) {
+      // so the unit tests work consistently
+      now = new Date(2025, 6, 29, 14, 52, 0)
+    } else {
+      now = new Date()
+    }
+    reminder.nextISODate = reminders_helpers.instantiate(now, reminder)
+  }
+
+  // the user of the KM can override this. this can be used to sync the GUI and the LUI
+  getCurrent() {
   }
 
   askAbout() {
@@ -85,7 +103,9 @@ const template = {
           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, context}) => {
             const text = await gsp(context.reminder.slice(1));
-            api.add({ text, date: context.date, time: context.time });
+            const reminder = { text, date: context.date, time: context.time }
+            api.instantiate(reminder)
+            api.add(reminder)
           },
         },
         {
@@ -179,7 +199,7 @@ knowledgeModule( {
       objects: [
         { 
           property: 'reminders',
-          filter: [ 'text', 'date', 'time' ],
+          filter: [ 'text', 'date', 'time', 'nextISODate', 'stm' ],
         }
       ],
     },

package/common/reminders.test.json

@@ -966,7 +966,12 @@
           "km": "reminders1",
           "reminders": [
             {
+              "fromSTM": true,
               "id": 1,
+              "pullFromContext": false,
+              "stm": {
+                "id": 1
+              },
               "text": "go to the store"
             }
           ]
@@ -980,6 +985,15 @@
         "stm2": {
           "km": "stm2",
           "mentioned": [
+            {
+              "fromSTM": true,
+              "id": 1,
+              "pullFromContext": false,
+              "stm": {
+                "id": 1
+              },
+              "text": "go to the store"
+            }
           ],
           "variables": {
           }
@@ -3509,7 +3523,12 @@
           "km": "reminders1",
           "reminders": [
             {
+              "fromSTM": true,
               "id": 1,
+              "pullFromContext": false,
+              "stm": {
+                "id": 1
+              },
               "text": "go to the store"
             }
           ]
@@ -3523,6 +3542,15 @@
         "stm2": {
           "km": "stm2",
           "mentioned": [
+            {
+              "fromSTM": true,
+              "id": 1,
+              "pullFromContext": false,
+              "stm": {
+                "id": 1
+              },
+              "text": "go to the store"
+            }
           ],
           "variables": {
           }
@@ -5307,7 +5335,12 @@
                 "value": "monday_dates",
                 "word": "monday"
               },
+              "fromSTM": true,
               "id": 1,
+              "pullFromContext": false,
+              "stm": {
+                "id": 1
+              },
               "text": "go to regina"
             }
           ]
@@ -5321,6 +5354,34 @@
         "stm2": {
           "km": "stm2",
           "mentioned": [
+            {
+              "date": {
+                "context_id": 2,
+                "context_index": 1,
+                "dead": true,
+                "level": 1,
+                "marker": "monday_dates",
+                "number": "one",
+                "range": {
+                  "end": 5,
+                  "start": 0
+                },
+                "text": "monday",
+                "topLevel": true,
+                "touchedBy": [
+                  "reminders#call2"
+                ],
+                "value": "monday_dates",
+                "word": "monday"
+              },
+              "fromSTM": true,
+              "id": 1,
+              "pullFromContext": false,
+              "stm": {
+                "id": 1
+              },
+              "text": "go to regina"
+            }
           ],
           "variables": {
           }
@@ -7528,7 +7589,13 @@
                 ],
                 "word": "on"
               },
+              "fromSTM": true,
               "id": 1,
+              "nextISODate": "2025-08-04T21:52:00.000Z",
+              "pullFromContext": false,
+              "stm": {
+                "id": 1
+              },
               "text": "go to the store"
             }
           ]
@@ -7542,6 +7609,59 @@
         "stm2": {
           "km": "stm2",
           "mentioned": [
+            {
+              "date": {
+                "date": {
+                  "dead": true,
+                  "level": 1,
+                  "marker": "monday_dates",
+                  "number": "one",
+                  "range": {
+                    "end": 37,
+                    "start": 32
+                  },
+                  "text": "monday",
+                  "types": [
+                    "monday_dates"
+                  ],
+                  "value": "monday_dates",
+                  "word": "monday"
+                },
+                "dead": true,
+                "default": true,
+                "interpolate": "${onDate} ${date}",
+                "level": 1,
+                "marker": "onDate",
+                "onDate": {
+                  "default": true,
+                  "level": 0,
+                  "marker": "onDate",
+                  "range": {
+                    "end": 30,
+                    "start": 29
+                  },
+                  "text": "on",
+                  "word": "on"
+                },
+                "range": {
+                  "end": 37,
+                  "start": 29
+                },
+                "text": "on monday",
+                "types": [
+                  "onDate"
+                ],
+                "word": "on"
+              },
+              "fromSTM": true,
+              "id": 1,
+              "nextISODate": "2025-08-04T21:52:00.000Z",
+              "pullFromContext": false,
+              "stm": {
+                "id": 1
+              },
+              "text": "go to the store"
+            }
           ],
           "variables": {
           }
@@ -9773,7 +9893,6 @@
         "word": "remind"
       }
     ],
-    "developerTest": false,
     "generatedParenthesized": [
       ""
     ],
@@ -10787,7 +10906,13 @@
                 ],
                 "word": "on"
               },
+              "fromSTM": true,
               "id": 1,
+              "nextISODate": "2025-08-04T21:52:00.000Z",
+              "pullFromContext": false,
+              "stm": {
+                "id": 1
+              },
               "text": "go to regina",
               "time": {
                 "dead": true,
@@ -10874,6 +10999,132 @@
         "stm2": {
           "km": "stm2",
           "mentioned": [
+            {
+              "date": {
+                "date": {
+                  "dead": true,
+                  "level": 1,
+                  "marker": "monday_dates",
+                  "number": "one",
+                  "range": {
+                    "end": 34,
+                    "start": 29
+                  },
+                  "text": "monday",
+                  "types": [
+                    "monday_dates"
+                  ],
+                  "value": "monday_dates",
+                  "word": "monday"
+                },
+                "dead": true,
+                "default": true,
+                "interpolate": "${onDate} ${date}",
+                "level": 1,
+                "marker": "onDate",
+                "onDate": {
+                  "default": true,
+                  "level": 0,
+                  "marker": "onDate",
+                  "range": {
+                    "end": 27,
+                    "start": 26
+                  },
+                  "text": "on",
+                  "word": "on"
+                },
+                "range": {
+                  "end": 34,
+                  "start": 26
+                },
+                "text": "on monday",
+                "types": [
+                  "onDate"
+                ],
+                "word": "on"
+              },
+              "fromSTM": true,
+              "id": 1,
+              "nextISODate": "2025-08-04T21:52:00.000Z",
+              "pullFromContext": false,
+              "stm": {
+                "id": 1
+              },
+              "text": "go to regina",
+              "time": {
+                "dead": true,
+                "default": true,
+                "interpolate": "${operator} ${time}",
+                "level": 1,
+                "marker": "atTime",
+                "operator": {
+                  "default": true,
+                  "level": 0,
+                  "marker": "atTime",
+                  "range": {
+                    "end": 37,
+                    "start": 36
+                  },
+                  "text": "at",
+                  "word": "at"
+                },
+                "range": {
+                  "end": 43,
+                  "start": 36
+                },
+                "text": "at 10 am",
+                "time": {
+                  "ampm": {
+                    "ampm": "am",
+                    "determined": true,
+                    "level": 0,
+                    "marker": "ampm",
+                    "range": {
+                      "end": 43,
+                      "start": 42
+                    },
+                    "text": "am",
+                    "word": "am"
+                  },
+                  "dead": true,
+                  "instance": true,
+                  "interpolate": "${time} ${ampm}",
+                  "level": 0,
+                  "marker": "time",
+                  "range": {
+                    "end": 43,
+                    "start": 39
+                  },
+                  "text": "10 am",
+                  "time": {
+                    "dead": true,
+                    "instance": true,
+                    "level": 1,
+                    "marker": "integer",
+                    "range": {
+                      "end": 40,
+                      "start": 39
+                    },
+                    "text": "10",
+                    "types": [
+                      "integer",
+                      "time"
+                    ],
+                    "value": 10,
+                    "word": "10"
+                  },
+                  "types": [
+                    "time"
+                  ],
+                  "value": 10,
+                  "word": "10"
+                },
+                "types": [
+                  "atTime"
+                ],
+                "word": "at"
+              }
+            }
           ],
           "variables": {
           }

package/common/time.js

@@ -201,19 +201,6 @@ const initializer = ({api, config, objects, kms, isModule}) => {
   })
 }
 
-console.log('greg23 ssssssssssssss')
-console.log(JSON.stringify(defaultContextCheck([
-  //{ 'event': { , 'target', 'one', 'two']
-  {
-    event: {
-      one: 'defaults',
-      two: 'defaults',
-      info: 'defaults',
-      target: 'defaults'
-    }
-  },
-]), null, 2))
-
 knowledgeModule({
   config,
   includes: [tell, numbers, countable],

package/package.json

@@ -216,7 +216,7 @@
     "common/helpers/meta.js",
     "common/helpers/ordering.js",
     "common/helpers/properties.js",
-    "common/helpers/properties.js",
+    "common/helpers/reminders.js",
     "common/hierarchy.js",
     "common/hierarchy.test.json",
     "common/javascript.js",
@@ -337,8 +337,8 @@
     "scriptjs": "^2.5.9",
     "table": "^6.7.1",
     "uuid": "^9.0.0",
-    "theprogrammablemind_4wp": "9.3.0-beta.7"
+    "theprogrammablemind_4wp": "9.3.0-beta.9"
   },
-  "version": "9.3.0-beta.7",
+  "version": "9.3.0-beta.9",
   "license": "UNLICENSED"
 }