tpmkms_4wp 9.3.0-beta.4 → 9.3.0-beta.41

package/common/formulas.instance.json

@@ -278,11 +278,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",

package/common/helpers/dateTimeSelectors.js

@@ -0,0 +1,92 @@
+const pluralize = require('pluralize')
+const deepEqual = require('deep-equal')
+const { chooseNumber, zip } = require('../helpers.js')
+const { compose, translationMapping, translationMappingToInstantiatorMappings } = require('./meta.js')
+
+function getNextDayOfWeek(date, targetDay) {
+  const dayMap = {
+    'sunday_dates': 0,
+    'monday_dates': 1,
+    'tuesday_dates': 2,
+    'wednesday_dates': 3,
+    'thursday_dates': 4,
+    'friday_dates': 5,
+    'saturday_dates': 6
+  };
+
+  const targetDayNum = dayMap[targetDay.toLowerCase()]
+  if (!targetDayNum) {
+    return
+  }
+  const currentDay = date.getDay();
+
+  let daysUntilNext = targetDayNum - currentDay;
+  if (daysUntilNext <= 0) {
+    daysUntilNext += 7; // If target day is today or past, get next week's occurrence
+  }
+
+  const nextDate = new Date(date);
+  nextDate.setDate(date.getDate() + daysUntilNext);
+  return nextDate;
+}
+
+function getTime(time) {
+  let hour = 0
+  const minute = 0
+  const second = 0
+  let hour_offset = 0
+  if (time.time?.ampm?.ampm == 'pm') {
+    hour_offset = 12
+  }
+  if (time.marker == 'integer') {
+    hour = time.value
+  } else if (time.marker == 'atTime') {
+    hour = time.time.value
+  }
+  hour += hour_offset
+  if (time.hour) {
+    hour = time.hour
+  }
+  if (time.second) {
+    second = time.second
+  }
+  if (time.minute) {
+    minute = time.minute
+  }
+  return { hour, minute, second }
+}
+
+instantiate = (isA, now, context) => {
+  if (isA(context?.marker, 'dateTimeSelector')) {
+    // (on date) OR (date)
+    const date = context.date?.date || context.date
+    const dateTimeSelector = getNextDayOfWeek(now, date.value)
+    const time = context.time || context.defaultTime
+    if (time) {
+      const hms = getTime(time)
+      dateTimeSelector.setHours(hms.hour)
+      dateTimeSelector.setMinutes(hms.minute)
+      dateTimeSelector.setSeconds(hms.second)
+      dateTimeSelector.setMilliseconds(0)
+    }
+    return dateTimeSelector.toISOString()
+  } else if (context.dateTimeSelector) {
+    const dateTimeSelector = getNextDayOfWeek(now, context.dateTimeSelector?.value)
+    if (dateTimeSelector) {
+      return dateTimeSelector.toISOString()
+    }
+  } else if (context.value) {
+    const dateTimeSelector = getNextDayOfWeek(now, context.value)
+    if (dateTimeSelector) {
+      return dateTimeSelector.toISOString()
+    }
+  }
+}
+
+until = (time) => {
+}
+
+module.exports = {
+  instantiate,
+  until,
+}

package/common/helpers/dialogues.js

@@ -77,12 +77,7 @@ class API {
   }
 
   // word is for one or many
-  makeObject({config, context, types=[], source_value=undefined, doPluralize=true} = {}) {
-    /*
-    if (!context.unknown) {
-      return context.value
-    }
-    */
+  makeObject({config, context, types=[], source_value=undefined, doPluralize=true, initial=''} = {}) {
     if (typeof context == 'string') {
       context = { word: context, value: context }
     }
@@ -107,7 +102,7 @@ class API {
     config.addOperator({ pattern: `(["${concept}"])`, allowDups: true })
     config.addBridge({ id: concept, level: 0, bridge: `{ ...next(operator), value: or(operator.value, '${source_value || concept}') }` , allowDups: true })
     const addConcept = (word, number) => {
-      config.addWord(word, { id: concept, initial: `{ value: "${source_value || concept}", number: "${number}" }` } )
+      config.addWord(word, { id: concept, initial: `{ value: "${source_value || concept}", number: "${number}" ${initial ? ', ': ''}${initial} }` } )
       const baseTypes = [
         'theAble',
         'queryable',
@@ -119,6 +114,7 @@ class API {
       this.setupObjectHierarchy(config, concept, {types: allTypes});
     }
 
+    pluralize.isSingular(word)
     if (pluralize.isSingular(word)) {
       addConcept(word, 'one')
       doPluralize && addConcept(pluralize.plural(word), 'many')

package/common/helpers.js

@@ -152,6 +152,7 @@ const toEValue = (context) => {
 }
 
 const defaultContextCheckValidify = (properties) => {
+  return // new way
   for (const value of properties) {
     if (typeof value == 'string') {
       continue
@@ -163,19 +164,35 @@ const defaultContextCheckValidify = (properties) => {
   }
 }
 
-const defaultContextCheckProperties = ['marker', 'text', 'verbatim', 'isResponse', { property: 'response', filter: ['marker', 'text', 'verbatim'] }] 
+const defaultContextCheckProperties = ['marker', 'text', 'verbatim', 'isResponse', 'types', { property: 'response', filter: ['marker', 'text', 'verbatim'] }] 
 
 const expand_checks = (properties) => {
-  const expanded = []
-  for (const property of properties) {
-    defaultContextCheckValidify(properties)
-    if (typeof property == 'string') {
-      expanded.push({ property, filter: defaultContextCheckProperties })
+  let expanded = []
+  if (properties == 'defaults') {
+    return defaultContextCheckProperties
+  }
+  if (Array.isArray(properties)) {
+    for (const property of properties) {
+      defaultContextCheckValidify(properties)
+      if (typeof property == 'string') {
+        expanded.push({ property, filter: defaultContextCheckProperties })
+      } else if (property.property && property.filter) {
+        expanded.push({ property: property.property, filter: [defaultContextCheckProperties, ...expand_checks(property.filter)] })
+      } else {
+        expanded = [...expanded, ...expand_checks(property)]
+      }
+    }
+    return expanded
+  }
+  for (const key of Object.keys(properties)) {
+    if (key === '_') {
+      expanded = [...expanded, ...defaultContextCheckProperties]
     } else {
-      expanded.push({ property: property.property, filter: [...defaultContextCheckProperties, ...expand_checks(property.filter)] })
+      expanded.push({ property: key, filter: [...expand_checks(properties[key])] })
     }
   }
   return expanded
+
 }
 
 const defaultContextCheck = (properties = []) => {

package/common/kirk.instance.json

@@ -500,11 +500,6 @@
           "theAble",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",

package/common/length.instance.json

@@ -254,11 +254,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -1686,11 +1681,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -4182,11 +4172,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -5898,11 +5883,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -7614,11 +7594,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -9321,11 +9296,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -11038,11 +11008,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -12755,11 +12720,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -14462,11 +14422,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -16178,11 +16133,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -17894,11 +17844,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -19610,11 +19555,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -21240,11 +21180,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -22947,11 +22882,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -24664,11 +24594,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",

package/common/math.instance.json

@@ -364,11 +364,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",

package/common/menus.instance.json

@@ -237,11 +237,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -1296,11 +1291,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -2539,11 +2529,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -3822,11 +3807,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -5066,11 +5046,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -6773,11 +6748,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -7929,11 +7899,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",

package/common/numbers.js

@@ -93,7 +93,7 @@ const config = {
     },
     { 
       where: where(),
-      match: ({context}) => ['number', 'integer'].includes(context.marker),
+      match: ({context}) => false && ['number', 'integer'].includes(context.marker),
       apply: ({context}) => `${context.value}` 
     },
   ],