tpmkms_4wp 9.3.0-beta.12 → 9.3.0-beta.14

package/common/dateTimeSelectors.instance.json

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

package/common/dateTimeSelectors.js

@@ -21,15 +21,14 @@ const dateTimeSelectors_helpers = require('./helpers/dateTimeSelectors')
    10 am
 */
 
-function instantiate(isProcess, dateTimeSelector) {
+function instantiate(isProcessOrTest, dateTimeSelector) {
   let now;
-  if (isProcess) {
+  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()
   }
-  // reminder.nextISODate = dateTimeSelectors_helpers.instantiate(now, reminder)
   return dateTimeSelectors_helpers.instantiate(now, dateTimeSelector)
 }
 
@@ -47,22 +46,13 @@ const template = {
           convolution: true,
           children: ['onDate_dates', 'atTime', 'date_dates'],
           bridge: "{ ...next(operator), date: after[0], time: after[1], interpolate: '${date} ${time}' }",
-          /*
-          evaluator: {
-            match: ({context, isA}) => isA(context.marker, 'dateTimeSelector'),
-            apply: ({context, isProcess}) => {
-              debugger
-              context.evalue = instantiate(isProcess, context)
-            },
-          }
-          */
         },
       ],
       semantics: [
         {
           match: ({context, isA}) => isA(context.marker, 'dateTimeSelector') && !!context.evaluate,
-          apply: ({context, isProcess}) => {
-            context.evalue = instantiate(isProcess, context)
+          apply: ({context, isProcess, isTest}) => {
+            context.evalue = instantiate(isProcess || isTest || context.isTest, context)
           },
         }
       ],

package/common/reminders.instance.json

@@ -17,7 +17,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            debugger\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 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          }"
         },
         {
           "id": "reminders",

package/common/reminders.js

@@ -30,15 +30,6 @@ class API {
   }
 
   async instantiate(reminder) {
-    let now;
-    if (this.args.isProcess) {
-      // so the unit tests work consistently
-      now = new Date(2025, 5, 29, 14, 52, 0)
-    } else {
-      now = new Date()
-    }
-    // reminder.nextISODate = dateTimeSelectors.instantiate(now, reminder)
-    // TODO make the evaluate work --> const value = await this.args.e(reminder.dateTimeSelector)
     const value = await this.args.e(reminder.dateTimeSelector)
     reminder.nextISODate = value?.evalue
   }

package/package.json

@@ -341,8 +341,8 @@
     "scriptjs": "^2.5.9",
     "table": "^6.7.1",
     "uuid": "^9.0.0",
-    "theprogrammablemind_4wp": "9.3.0-beta.12"
+    "theprogrammablemind_4wp": "9.3.0-beta.14"
   },
-  "version": "9.3.0-beta.12",
+  "version": "9.3.0-beta.14",
   "license": "UNLICENSED"
 }