tpmkms_4wp 9.3.0-beta.46 → 9.3.0-beta.48

package/common/colors.instance.json

@@ -3586,20 +3586,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -36049,20 +36035,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "is",

package/common/dateTimeSelectors.instance.json

@@ -2,9 +2,20 @@
   "configs": [
     {
       "operators": [
-        "([dateTimeSelector] (onDate) (atTime))"
+        "([dateTimeSelector] (onDate) (atTime))",
+        "((day_dates/*) [dayOfMonth|of] (month_dates/*))"
       ],
       "bridges": [
+        {
+          "id": "dayOfMonth",
+          "after": [
+            "preposition"
+          ],
+          "before": [
+            "verb"
+          ],
+          "bridge": "{ ...next(operator), day: before[0], month: after[0], operator: operator, interpolate: '${day} ${operator} ${month}' }"
+        },
         {
           "id": "dateTimeSelector",
           "after": [
@@ -24,9 +35,15 @@
       ],
       "semantics": [
         {
-          "match": "({context, isA}) => (isA(context.marker, 'onDateValue_dates') || isA(context.marker, 'dateTimeSelector')) && !!context.evaluate",
+          "match": "({context, isA}) => {\n            if (!context.evaluate) {\n              return false\n            }\n            if (isA(context.marker, 'onDateValue_dates')) {\n              return true\n            }\n            if (isA(context.marker, 'dateTimeSelector')) {\n              return true\n            }\n          }",
           "apply": "({context, isProcess, isTest, kms, isA}) => {\n            context.evalue = instantiate(kms, isA, isProcess || isTest || context.isTest, context)\n          }"
         }
+      ],
+      "hierarchy": [
+        [
+          "day_dates",
+          "orderable"
+        ]
       ]
     }
   ],
@@ -34,9 +51,20 @@
     {
       "extraConfig": true,
       "operators": [
-        "([dateTimeSelector] (onDate) (atTime))"
+        "([dateTimeSelector] (onDate) (atTime))",
+        "((day_dates/*) [dayOfMonth|of] (month_dates/*))"
       ],
       "bridges": [
+        {
+          "id": "dayOfMonth",
+          "after": [
+            "preposition"
+          ],
+          "before": [
+            "verb"
+          ],
+          "bridge": "{ ...next(operator), day: before[0], month: after[0], operator: operator, interpolate: '${day} ${operator} ${month}' }"
+        },
         {
           "id": "dateTimeSelector",
           "after": [
@@ -56,6 +84,12 @@
       ],
       "semantics": [
         {}
+      ],
+      "hierarchy": [
+        [
+          "day_dates",
+          "orderable"
+        ]
       ]
     }
   ],

package/common/dateTimeSelectors.js

@@ -20,6 +20,7 @@ const dateTimeSelectors_helpers = require('./helpers/dateTimeSelectors')
    the last tuesday of every third month
    monday at 10 am
    10 am
+   first monday after jan 1
 */
 
 function instantiate(kms, isA, isProcessOrTest, dateTimeSelector) {
@@ -31,13 +32,37 @@ function instantiate(kms, isA, isProcessOrTest, dateTimeSelector) {
   }
 }
 
+function removeDatesSuffix(str) {
+  if (str.endsWith('_dates')) {
+    return str.slice(0, -6); // Removes last 6 characters
+  }
+  return str;
+}
+
+function onOrIs(marker, context) {
+  if (context.marker === marker) {
+    return context
+  }
+  if (context.marker === 'onDate_dates' && context.date?.marker == marker) {
+    return context.date
+  }
+}
+
 const template = {
   configs: [
     { 
       operators: [
         "([dateTimeSelector] (onDate) (atTime))",
+        "((day_dates/*) [dayOfMonth|of] (month_dates/*))",
       ],
       bridges: [
+        { 
+          id: 'dayOfMonth', 
+          after: ['preposition'],
+          isA: ['onDateValue_dates'],
+          before: ['verb', 'onDate_dates'],
+          bridge: "{ ...next(operator), day: before[0], month: after[0], operator: operator, interpolate: '${day} ${operator} ${month}' }",
+        },
         { 
           id: 'dateTimeSelector', 
           after: ['preposition'],
@@ -49,12 +74,38 @@ const template = {
       ],
       semantics: [
         {
-          match: ({context, isA}) => (isA(context.marker, 'onDateValue_dates') || isA(context.marker, 'dateTimeSelector')) && !!context.evaluate,
+          match: ({context, isA}) => context.evaluate && onOrIs('dayOfMonth', context),
+          apply: ({context, isProcess, isTest, kms, isA}) => {
+            try {
+              const now = kms.time.api.now()
+              const date = onOrIs('dayOfMonth', context)
+              debugger
+              context.evalue = dateTimeSelectors_helpers.getNthDayOfMonth(removeDatesSuffix(date.day.value), date.day.ordinal.value || 1, removeDatesSuffix(date.month.value), now)
+            } catch ( e ) {
+              context.evalue = `Implement instatiate for this type of date. See the dateTimeSelectors KM ${where()}. ${e}`
+            }
+          },
+        },
+        {
+          match: ({context, isA}) => {
+            if (!context.evaluate) {
+              return false
+            }
+            if (isA(context.marker, 'onDateValue_dates')) {
+              return true
+            }
+            if (isA(context.marker, 'dateTimeSelector')) {
+              return true
+            }
+          },
           apply: ({context, isProcess, isTest, kms, isA}) => {
             context.evalue = instantiate(kms, isA, isProcess || isTest || context.isTest, context)
           },
         }
       ],
+      hierarchy: [
+        ['day_dates', 'orderable'],
+      ],
     },
   ],
 }