tpmkms_4wp 9.3.0-beta.45 → 9.3.0-beta.47

package/common/edible.instance.json

@@ -6494,20 +6494,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -24632,20 +24618,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -69665,34 +69637,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "is",

package/common/fastfood.instance.json

@@ -89995,24 +89995,6 @@
             0
           ]
         ],
-        [
-          [
-            "list",
-            1
-          ],
-          [
-            "modifies",
-            0
-          ],
-          [
-            "strawberry",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "list",
@@ -110432,6 +110414,24 @@
             0
           ]
         ],
+        [
+          [
+            "ingredient",
+            0
+          ],
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "smoothie",
+            0
+          ]
+        ],
         [
           [
             "ingredient",
@@ -137495,60 +137495,6 @@
             0
           ]
         ],
-        [
-          [
-            "asiago",
-            0
-          ],
-          [
-            "chicken",
-            0
-          ],
-          [
-            "club",
-            0
-          ],
-          [
-            "cod",
-            0
-          ],
-          [
-            "comma",
-            0
-          ],
-          [
-            "grill",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "premium",
-            0
-          ],
-          [
-            "ranch",
-            0
-          ],
-          [
-            "sandwich",
-            0
-          ],
-          [
-            "ultimate",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "chicken",
@@ -347597,60 +347543,6 @@
             0
           ]
         ],
-        [
-          [
-            "breakfast",
-            0
-          ],
-          [
-            "comma",
-            0
-          ],
-          [
-            "double",
-            0
-          ],
-          [
-            "french",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "meal",
-            0
-          ],
-          [
-            "muffin",
-            0
-          ],
-          [
-            "oatmeal",
-            0
-          ],
-          [
-            "pancake",
-            0
-          ],
-          [
-            "platter",
-            0
-          ],
-          [
-            "sausage",
-            0
-          ],
-          [
-            "toast",
-            0
-          ]
-        ],
         [
           [
             "breakfast",
@@ -573451,6 +573343,24 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "kid",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "meal",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -595987,6 +595897,52 @@
             0
           ]
         ],
+        [
+          [
+            "chicken",
+            0
+          ],
+          [
+            "club",
+            0
+          ],
+          [
+            "comma",
+            0
+          ],
+          [
+            "crispy",
+            0
+          ],
+          [
+            "go",
+            0
+          ],
+          [
+            "is",
+            0
+          ],
+          [
+            "junior",
+            0
+          ],
+          [
+            "list",
+            0
+          ],
+          [
+            "meal",
+            0
+          ],
+          [
+            "value",
+            0
+          ],
+          [
+            "wrap",
+            0
+          ]
+        ],
         [
           [
             "chicken",
@@ -609844,60 +609800,6 @@
         0
       ]
     ],
-    [
-      [
-        "asiago",
-        0
-      ],
-      [
-        "chicken",
-        0
-      ],
-      [
-        "club",
-        0
-      ],
-      [
-        "cod",
-        0
-      ],
-      [
-        "comma",
-        0
-      ],
-      [
-        "grill",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "premium",
-        0
-      ],
-      [
-        "ranch",
-        0
-      ],
-      [
-        "sandwich",
-        0
-      ],
-      [
-        "ultimate",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "bacon",
@@ -611448,60 +611350,6 @@
         0
       ]
     ],
-    [
-      [
-        "breakfast",
-        0
-      ],
-      [
-        "comma",
-        0
-      ],
-      [
-        "double",
-        0
-      ],
-      [
-        "french",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "meal",
-        0
-      ],
-      [
-        "muffin",
-        0
-      ],
-      [
-        "oatmeal",
-        0
-      ],
-      [
-        "pancake",
-        0
-      ],
-      [
-        "platter",
-        0
-      ],
-      [
-        "sausage",
-        0
-      ],
-      [
-        "toast",
-        0
-      ]
-    ],
     [
       [
         "breakfast",
@@ -612104,6 +611952,52 @@
         0
       ]
     ],
+    [
+      [
+        "chicken",
+        0
+      ],
+      [
+        "club",
+        0
+      ],
+      [
+        "comma",
+        0
+      ],
+      [
+        "crispy",
+        0
+      ],
+      [
+        "go",
+        0
+      ],
+      [
+        "is",
+        0
+      ],
+      [
+        "junior",
+        0
+      ],
+      [
+        "list",
+        0
+      ],
+      [
+        "meal",
+        0
+      ],
+      [
+        "value",
+        0
+      ],
+      [
+        "wrap",
+        0
+      ]
+    ],
     [
       [
         "chicken",
@@ -613656,6 +613550,24 @@
         0
       ]
     ],
+    [
+      [
+        "ingredient",
+        0
+      ],
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "smoothie",
+        0
+      ]
+    ],
     [
       [
         "ingredient",
@@ -613718,6 +613630,24 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "kid",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "meal",
+        0
+      ]
+    ],
     [
       [
         "is",
@@ -614250,24 +614180,6 @@
         0
       ]
     ],
-    [
-      [
-        "list",
-        1
-      ],
-      [
-        "modifies",
-        0
-      ],
-      [
-        "strawberry",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "list",

package/common/helpers/dateTimeSelectors.js

@@ -86,17 +86,26 @@ function getTime(time) {
 }
 
 instantiate = (isA, now, context) => {
-  debugger
-  if (
-       (context.marker == 'onDate_dates' && context.date?.marker == 'monthDayYear_dates') ||
-       (context.marker == 'monthDayYear_dates')
-     ) {
-    if (context.marker == 'onDate_dates') {
-      context = context.date
+  const getType = (context, type) => {
+    if (context.marker == 'onDate_dates' && context.date?.marker == type) {
+      return context.date
+    } if (context.marker == type) {
+      return context
     }
-    const day = context.day.value;
-    const month = toMonthNumber(context.month.value);
-    const year = context.year.value;
+  }
+  let value
+  if (value = getType(context, 'monthDay_dates')) {
+    const day = value.day.value;
+    const month = toMonthNumber(value.month.value);
+    const currentMonth = now.getMonth() + 1; // 1-based (January = 1)
+    const currentYear = now.getFullYear();
+    const year = currentMonth >= month ? currentYear + 1 : currentYear;
+    const date = new Date(year, month-1, day)
+    return date.toISOString()
+  } else if (value = getType(context, 'monthDayYear_dates')) {
+    const day = value.day.value;
+    const month = toMonthNumber(value.month.value);
+    const year = value.year.value;
     const date = new Date(year, month-1, day)
     return date.toISOString()
   } else if (isA(context?.marker, 'dateTimeSelector')) {
@@ -125,10 +134,50 @@ instantiate = (isA, now, context) => {
   }
 }
 
+// function getNthDayOfMonth(dayName, ordinal, monthName, year = new Date().getFullYear()) {
+function getNthDayOfMonth(dayName, ordinal, monthName, now) {
+  // Validate inputs
+  const days = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];
+  const months = [
+    'january', 'february', 'march', 'april', 'may', 'june',
+    'july', 'august', 'september', 'october', 'november', 'december'
+  ];
+
+  let year = now.getFullYear()
+
+  dayName = dayName.toLowerCase();
+  monthName = monthName.toLowerCase();
+
+  if (!days.includes(dayName)) throw new Error('Invalid day name');
+  if (!months.includes(monthName)) throw new Error('Invalid month name');
+  if (!Number.isInteger(ordinal) || ordinal < 1 || ordinal > 5) throw new Error('Ordinal must be an integer between 1 and 5');
+
+  const monthIndex = months.indexOf(monthName);
+  if (monthIndex <= now.getMonth()) {
+    year += 1
+  }
+  const targetDayIndex = days.indexOf(dayName);
+
+  let date = new Date(year, monthIndex, 1);
+
+  while (date.getDay() !== targetDayIndex) {
+    date.setDate(date.getDate() + 1);
+  }
+
+  date.setDate(date.getDate() + (ordinal - 1) * 7);
+
+  if (date.getMonth() !== monthIndex) {
+    throw new Error(`The ${ordinal}th ${dayName} does not exist in ${monthName} ${year}`);
+  }
+
+  return date.toISOString();
+}
+
 until = (time) => {
 }
 
 module.exports = {
   instantiate,
   until,
+  getNthDayOfMonth,
 }

package/common/people.instance.json

@@ -8430,6 +8430,24 @@
             0
           ]
         ],
+        [
+          [
+            "by",
+            0
+          ],
+          [
+            "isEd",
+            0
+          ],
+          [
+            "owned",
+            0
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "isEd",
@@ -8828,6 +8846,24 @@
         0
       ]
     ],
+    [
+      [
+        "by",
+        0
+      ],
+      [
+        "isEd",
+        0
+      ],
+      [
+        "owned",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "first",