tpmkms_4wp 9.3.0-beta.13 → 9.3.0-beta.15

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,15 +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()
-  }
-  // reminder.nextISODate = dateTimeSelectors_helpers.instantiate(now, reminder)
+function instantiate(kms, isProcessOrTest, dateTimeSelector) {
+  const now = kms.time.api.now()
   return dateTimeSelectors_helpers.instantiate(now, dateTimeSelector)
 }
 
@@ -52,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)
+          apply: ({context, isProcess, isTest, kms}) => {
+            context.evalue = instantiate(kms, isProcess || isTest || context.isTest, context)
           },
         }
       ],

package/common/reminders.js

@@ -30,15 +30,6 @@ class API {
   }
 
   async instantiate(reminder) {
-    let now;
-    if (this.args.isProcess || this.args.isTest) {
-      // 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/common/time.js

@@ -29,6 +29,14 @@ class API {
     context.event = promise
   }
 
+  now() {
+    if (this.args.isProcess || this.args.isTest) {
+      return new Date(2025, 5, 29, 14, 52, 0)
+    } else {
+      return new Date()
+    }
+  }
+
   newDate() {
     return new Date()
   }

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.13"
+    "theprogrammablemind_4wp": "9.3.0-beta.15"
   },
-  "version": "9.3.0-beta.13",
+  "version": "9.3.0-beta.15",
   "license": "UNLICENSED"
 }