tpmkms_4wp 9.3.0-beta.14 → 9.3.0-beta.16

package/common/dateTimeSelectors.instance.json

@@ -25,7 +25,7 @@
       "semantics": [
         {
           "match": "({context, isA}) => isA(context.marker, 'dateTimeSelector') && !!context.evaluate",
-          "apply": "({context, isProcess, isTest}) => {\n            context.evalue = instantiate(isProcess || isTest, context)\n          }"
+          "apply": "({context, isProcess, isTest, kms}) => {\n            context.evalue = instantiate(kms, isProcess || isTest || context.isTest, context)\n          }"
         }
       ]
     }

package/common/dateTimeSelectors.js

@@ -12,6 +12,7 @@ const dateTimeSelectors_helpers = require('./helpers/dateTimeSelectors')
    delete it
    make it friday instead
    2 sundays from now
+   2 sundays from last tuesday
    the sunday after july 1st
    the first tuesday after july 1st
    the first tuesday on or after july 1st
@@ -21,14 +22,8 @@ const dateTimeSelectors_helpers = require('./helpers/dateTimeSelectors')
    10 am
 */
 
-function instantiate(isProcessOrTest, dateTimeSelector) {
-  let now;
-  if (isProcessOrTest) {
-    // so the unit tests work consistently. the month is zero based so 5 is june
-    now = new Date(2025, 5, 29, 14, 52, 0)
-  } else {
-    now = new Date()
-  }
+function instantiate(kms, isProcessOrTest, dateTimeSelector) {
+  const now = kms.time.api.now()
   return dateTimeSelectors_helpers.instantiate(now, dateTimeSelector)
 }
 
@@ -51,8 +46,8 @@ const template = {
       semantics: [
         {
           match: ({context, isA}) => isA(context.marker, 'dateTimeSelector') && !!context.evaluate,
-          apply: ({context, isProcess, isTest}) => {
-            context.evalue = instantiate(isProcess || isTest || context.isTest, context)
+          apply: ({context, isProcess, isTest, kms}) => {
+            context.evalue = instantiate(kms, isProcess || isTest || context.isTest, context)
           },
         }
       ],

package/common/helpers/dialogues.js

@@ -78,11 +78,6 @@ class API {
 
   // word is for one or many
   makeObject({config, context, types=[], source_value=undefined, doPluralize=true} = {}) {
-    /*
-    if (!context.unknown) {
-      return context.value
-    }
-    */
     if (typeof context == 'string') {
       context = { word: context, value: context }
     }
@@ -119,6 +114,12 @@ class API {
       this.setupObjectHierarchy(config, concept, {types: allTypes});
     }
 
+    try {
+      pluralize.isSingular(word)
+    } catch ( e ) {
+      debugger
+      return
+    }
     if (pluralize.isSingular(word)) {
       addConcept(word, 'one')
       doPluralize && addConcept(pluralize.plural(word), 'many')

package/common/reminders.js

@@ -13,6 +13,9 @@ const helpers = require('./helpers')
    make it friday instead
    2 sundays from now
    the sunday after july 1st
+   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
 */
 
 class API {
@@ -29,6 +32,13 @@ class API {
     this.args.mentioned({ context: reminder })
   }
 
+  addRemindable(id, text) {
+    if (!text) {
+      text = id
+    }
+    this.args.makeObject({ ...this.args, context: { word: text, value: id, number: 'one' }, types: ['remindable'] })
+  }
+
   async instantiate(reminder) {
     const value = await this.args.e(reminder.dateTimeSelector)
     reminder.nextISODate = value?.evalue
@@ -87,16 +97,32 @@ const template = {
   configs: [
     { 
       operators: [
-        "([remind] (self/*) (!@<= 'dateTimeSelector')*)",
-        "([remind:withDateBridge] (self/*) (!@<= 'dateTimeSelector')* (dateTimeSelector))",
-        "([remind:withDateAndTimeBridge] (self/*) (!@<= 'dateTimeSelector')* (dateTimeSelector) (atTime))",
+        "([remindable])",
+        { pattern: "([addRemindable] (word)*)", development: true },
+        "([remind] (remindable/*) (!@<= 'dateTimeSelector')*)",
+        "([remind:withDateBridge] (remindable/*) (!@<= 'dateTimeSelector')* (dateTimeSelector))",
+        "([remind:withDateAndTimeBridge] (remindable/*) (!@<= 'dateTimeSelector')* (dateTimeSelector) (atTime))",
         "([show] ([reminders]))",
         "([delete_reminders|delete,cancel] (number/*))",
       ],
       bridges: [
+        {
+          id: 'addRemindable',
+          isA: ['verb'],
+          development: true,
+          bridge: "{ ...next(operator), arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
+          semantic: ({api, context}) => {
+            const name = context.arg.map( (word) => word.text ).join(' ')
+            api.addRemindable(name)
+          }
+        },
+        {
+          id: 'remindable',
+        },
         {
           id: 'remind',
           isA: ['verb'],
+          localHierarchy: [['self', 'remindable']],
           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}' }",