tpmkms_4wp 9.3.0-beta.50 → 9.3.0-beta.52

package/common/helpers/dateTimeSelectors.js

@@ -3,16 +3,17 @@ const deepEqual = require('deep-equal')
 const { chooseNumber, zip } = require('../helpers.js')
 const { compose, translationMapping, translationMappingToInstantiatorMappings } = require('./meta.js')
 
+const dayMap = {
+  'sunday_dates': 0,
+  'monday_dates': 1,
+  'tuesday_dates': 2,
+  'wednesday_dates': 3,
+  'thursday_dates': 4,
+  'friday_dates': 5,
+  'saturday_dates': 6
+};
+
 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) {
@@ -96,7 +97,8 @@ instantiate = (isA, now, context) => {
   let value
   if (value = getType(context, 'monthDay_dates')) {
     const day = value.day.value;
-    const month = toMonthNumber(value.month.value);
+    // const month = toMonthNumber(value.month.value);
+    const month = value.month.month_ordinal
     const currentMonth = now.getMonth() + 1; // 1-based (January = 1)
     const currentYear = now.getFullYear();
     const year = currentMonth >= month ? currentYear + 1 : currentYear;
@@ -104,7 +106,8 @@ instantiate = (isA, now, context) => {
     return date.toISOString()
   } else if (value = getType(context, 'monthDayYear_dates')) {
     const day = value.day.value;
-    const month = toMonthNumber(value.month.value);
+    // const month = toMonthNumber(value.month.value);
+    const month = value.month.month_ordinal
     const year = value.year.value;
     const date = new Date(year, month-1, day)
     return date.toISOString()
@@ -138,10 +141,7 @@ instantiate = (isA, now, context) => {
 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'
-  ];
+  const months = [ 'january', 'february', 'march', 'april', 'may', 'june', 'july', 'august', 'september', 'october', 'november', 'december' ];
 
   let year = now.getFullYear()
 
@@ -173,11 +173,26 @@ function getNthDayOfMonth(dayName, ordinal, monthName, now) {
   return date.toISOString();
 }
 
-until = (time) => {
+function getNthWeekdayAfterDate(startDate, weekday_ordinal, n) {
+  // Ensure startDate is a Date object
+  const date = new Date(startDate);
+  let weekday_index = weekday_ordinal - 1
+  // Normalize weekday_index (0 = Sunday, 1 = Monday, ..., 6 = Saturday)
+  weekday_index = (weekday_index % 7 + 7) % 7;
+  // Get current day of the week
+  const currentDay = date.getDay();
+  // Calculate days until the next desired weekday_index
+  let daysUntilNext = (weekday_index - currentDay + 7) % 7;
+  if (daysUntilNext === 0) daysUntilNext = 7; // Move to next occurrence if already on the desired weekday_index
+  // Calculate total days to add: days until next weekday_index + 7 days for each additional occurrence
+  const daysToAdd = daysUntilNext + (n - 1) * 7;
+  // Add days to the start date
+  date.setDate(date.getDate() + daysToAdd);
+  return date.toISOString();
 }
 
 module.exports = {
   instantiate,
-  until,
   getNthDayOfMonth,
+  getNthWeekdayAfterDate,
 }

package/common/helpers/dialogues.js

@@ -77,7 +77,7 @@ class API {
   }
 
   // word is for one or many
-  makeObject({config, context, types=[], source_value=undefined, doPluralize=true, initial=''} = {}) {
+  async makeObject({config, context, types=[], source_value=undefined, doPluralize=true, initial={}} = {}) {
     if (typeof context == 'string') {
       context = { word: context, value: context }
     }
@@ -98,11 +98,18 @@ class API {
       }
       return concept
     }
+
+    initial.value = source_value || concept
+    await this.args.s({ value, makeObject: true, initial })
     // config.addOperator({ pattern: `(["${fixUps(concept)}"])`, allowDups: true })
-    config.addOperator({ pattern: `(["${concept}"])`, allowDups: true })
+    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}" ${initial ? ', ': ''}${initial} }` } )
+      if (number) {
+        initial.number = number
+      }
+      config.addWord(word, { id: concept, initial: JSON.stringify(initial) } )
       const baseTypes = [
         'theAble',
         'queryable',

package/common/helpers/properties.js

@@ -546,9 +546,9 @@ class API {
     }
   }
 
-  makeObject(args) {
+  async makeObject(args) {
 		const types = [ 'hierarchyAble', 'object', 'property' ];
-    return args.km("dialogues").api.makeObject({ ...args, types: (args.types || []).concat(types) });
+    return await args.km("dialogues").api.makeObject({ ...args, types: (args.types || []).concat(types) });
   }
 
   relation_add (relations) {

package/common/helpers.js

@@ -166,20 +166,23 @@ const defaultContextCheckValidify = (properties) => {
 
 const defaultContextCheckProperties = ['marker', 'text', 'verbatim', 'isResponse', 'types', { property: 'response', filter: ['marker', 'text', 'verbatim'] }] 
 
-const expand_checks = (properties) => {
+const expand_checks = (properties, variables = {}) => {
   let expanded = []
   if (properties == 'defaults') {
     return defaultContextCheckProperties
   }
+  if (properties.variable) {
+    return variables[properties.variable]
+  }
   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)] })
+        expanded.push({ property: property.property, filter: [defaultContextCheckProperties, ...expand_checks(property.filter, variables)] })
       } else {
-        expanded = [...expanded, ...expand_checks(property)]
+        expanded = [...expanded, ...expand_checks(property, variables)]
       }
     }
     return expanded
@@ -188,38 +191,43 @@ const expand_checks = (properties) => {
     if (key === '_') {
       expanded = [...expanded, ...defaultContextCheckProperties]
     } else {
-      expanded.push({ property: key, filter: [...expand_checks(properties[key])] })
+      expanded.push({ property: key, filter: [...expand_checks(properties[key], variables)] })
     }
   }
   return expanded
 
 }
 
-const defaultContextCheck = (properties = []) => {
+const defaultContextCheck = (properties = [], variables={}, minimal=false) => {
   defaultContextCheckValidify(properties)
-  return [
-    ...defaultContextCheckProperties,
-    // ...properties.map((property) => { return { property, filter: defaultContextCheckProperties } }),
-    ...expand_checks(properties),
-    (object) => {
-      if (typeof object.value == 'object') {
-        return { property: 'value', filter: defaultContextCheckProperties }
-      } else {
-        return 'value'
-      }
-    },
-    (object) => {
-      if (!Array.isArray(object.modifiers)) {
-        return
-      }
-      if (typeof object.modifiers[0] == 'object') {
-        return { property: 'modifiers', filter: defaultContextCheckProperties }
-      } else {
-        return 'modifiers'
-      }
-    },
-    { property: 'modifiers', isPropertyList: true, filter: defaultContextCheckProperties }
-  ]
+  variables.defaults = defaultContextCheckProperties
+  if (minimal) {
+    return expand_checks(properties, variables)
+  } else {
+    return [
+      ...defaultContextCheckProperties,
+      // ...properties.map((property) => { return { property, filter: defaultContextCheckProperties } }),
+      ...expand_checks(properties, variables),
+      (object) => {
+        if (typeof object.value == 'object') {
+          return { property: 'value', filter: defaultContextCheckProperties }
+        } else {
+          return 'value'
+        }
+      },
+      (object) => {
+        if (!Array.isArray(object.modifiers)) {
+          return
+        }
+        if (typeof object.modifiers[0] == 'object') {
+          return { property: 'modifiers', filter: defaultContextCheckProperties }
+        } else {
+          return 'modifiers'
+        }
+      },
+      { property: 'modifiers', isPropertyList: true, filter: defaultContextCheckProperties }
+    ]
+  }
 }
 
 const isA = (hierarchy) => (child, parent, { strict=false } = {}) => {

package/common/hierarchy.js

@@ -164,15 +164,15 @@ const config = {
       notes: 'c is a y',
       where: where(),
       match: ({context, listable}) => listable(context.marker, 'hierarchyAble') && !context.pullFromContext && !context.wantsValue && context.same && !context.same.pullFromContext && context.same.wantsValue,
-      apply: ({context, km, objects, asList, baseConfig : config}) => {
+      apply: async ({context, km, objects, asList, baseConfig : config}) => {
         const api = km('properties').api
         // mark c as an instance?
         const oneConcepts = asList(context);
         const twoConcepts = asList(context.same);
         for (let oneConcept of oneConcepts.value) {
           for (let twoConcept of twoConcepts.value) {
-            oneConcept = api.makeObject({config, context})
-            twoConcept = api.makeObject({config, context: context.same})
+            oneConcept = await api.makeObject({config, context})
+            twoConcept = await api.makeObject({config, context: context.same})
             api.rememberIsA(oneConcept, twoConcept)
           }
         }
@@ -183,14 +183,14 @@ const config = {
       notes: 'an x is a y',
       where: where(),
       match: ({context, listable}) => listable(context.marker, 'hierarchyAble') && !context.pullFromContext && context.wantsValue && context.same,
-      apply: ({context, km, objects, baseConfig : config, asList}) => {
+      apply: async ({context, km, objects, baseConfig : config, asList}) => {
         const api = km('properties').api
         const oneConcepts = asList(context);
         const twoConcepts = asList(context.same);
         for (let oneConcept of oneConcepts.value) {
           for (let twoConcept of twoConcepts.value) {
-            oneConcept = api.makeObject({config, context})
-            twoConcept = api.makeObject({config, context: context.same})
+            oneConcept = await api.makeObject({config, context})
+            twoConcept = await api.makeObject({config, context: context.same})
             api.rememberIsA(oneConcept, twoConcept) 
             context.sameWasProcessed = true
           }
@@ -246,15 +246,15 @@ const config = {
        
         return listable(context, 'hierarchyAble') && context.same && context.same.concept && !context.query
       },
-      apply: (args) => {
+      apply: async (args) => {
         const {callId, config, objects, km, context, asList, listable} = args
         const api = km('properties').api
         const oneConcepts = asList(context);
         const twoConcepts = asList(context.same);
         for (const oneConcept of oneConcepts.value) {
           for (const twoConcept of twoConcepts.value) {
-            oneConceptId = api.makeObject({...args, context: oneConcept})
-            twoConceptId = api.makeObject({...args, context: twoConcept})
+            oneConceptId = await api.makeObject({...args, context: oneConcept})
+            twoConceptId = await api.makeObject({...args, context: twoConcept})
             api.rememberIsA(oneConceptId, twoConceptId)
             context.sameWasProcessed = true
           }

package/common/meta.js

@@ -288,12 +288,12 @@ const config = {
         if (kms.dialogues) {
           if (context.from.unknown && !context.to.unknown) {
             // kms.dialogues.api.makeObject({ context: context.from, types: [context.to.marker], source_value: context.to.value, config });
-            kms.dialogues.api.makeObject({ context: context.from, types: [context.to.marker], source_value: context.to.value, config });
+            await kms.dialogues.api.makeObject({ context: context.from, types: [context.to.marker], source_value: context.to.value, config });
           }
           if (context.to.value) {
             kms.stm.api.setVariable(context.from.value, context.to.value)
           } else {
-            kms.dialogues.api.makeObject({ context: context.from, types: context.to.types || [], config });
+            await kms.dialogues.api.makeObject({ context: context.from, types: context.to.types || [], config });
             kms.stm.api.setVariable(context.from.value, context.to)
           }
         }

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",

package/common/properties.js

@@ -432,9 +432,9 @@ const config = {
     {
       where: where(),
       match: ({context}) => context.marker == 'concept' && context.same,
-      apply: (args) => {
+      apply: async (args) => {
         const {context} = args
-        args.makeObject({ ...args, context: context.same })
+        await args.makeObject({ ...args, context: context.same })
         context.sameWasProcessed = true
       }
     },
@@ -550,8 +550,8 @@ const config = {
         const propertyContext = context;
         const objectId = context.object.value
 
-        api.makeObject({ ...args, context: objectContext })
-        api.makeObject({ ...args, context: propertyContext })
+        await api.makeObject({ ...args, context: objectContext })
+        await api.makeObject({ ...args, context: propertyContext })
         // const propertyId = context.value
         /*
         const propertyId = context.marker

package/common/reminders.instance.json

@@ -53,7 +53,7 @@
           ],
           "development": true,
           "bridge": "{ ...next(operator), flatten: true, arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
-          "semantic": "({api, context}) => {\n            const name = context.arg.map( (word) => word.text ).join(' ')\n            api.addRemindable(name)\n          }"
+          "semantic": "async ({api, context}) => {\n            const name = context.arg.map( (word) => word.text ).join(' ')\n            await api.addRemindable(name)\n          }"
         },
         {
           "id": "remindable",

package/common/reminders.js

@@ -110,11 +110,11 @@ class API {
     }
   }
 
-  addRemindable(id, text) {
+  async addRemindable(id, text) {
     if (!text) {
       text = id
     }
-    this.args.makeObject({ ...this.args, context: { word: text, value: id, number: 'one', remindee_id: id }, initial: `remindee_id: "${id}"`, types: ['remindable'] })
+    await this.args.makeObject({ ...this.args, context: { word: text, value: id, number: 'one', remindee_id: id }, initial: { remindee_id: `${id}` }, types: ['remindable'] })
   }
 
   async instantiate(reminder) {
@@ -222,6 +222,7 @@ const template = {
         "([remind:justWhoBridge] (remindable/*))",
         "([remind] (remindable/*) (!@<= 'dateTimeSelector' && !@<= 'inAddition')*)",
         "([remind:withDateBridge] (remindable/*) (!@<= 'dateTimeSelector' && !@<= 'inAddition')* (dateTimeSelector))",
+        "([remind:withDateFirstBridge] (remindable/*) (dateTimeSelector) (!@<= 'dateTimeSelector' && !@<= 'inAddition')*)",
         "([remind:withDateAndTimeBridge] (remindable/*) (!@<= 'dateTimeSelector' && !@<= 'inAddition')* (dateTimeSelector) (atTime))",
         "([remindResponse] (!@<= 'remindResponse' && !@<= 'dateTimeSelector' && !@<= 'inAddition')+ (dateTimeSelector))",
         "([show] ([reminders]))",
@@ -258,9 +259,9 @@ const template = {
           isA: ['verb'],
           development: true,
           bridge: "{ ...next(operator), flatten: true, arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
-          semantic: ({api, context}) => {
+          semantic: async ({api, context}) => {
             const name = context.arg.map( (word) => word.text ).join(' ')
-            api.addRemindable(name)
+            await api.addRemindable(name)
           }
         },
         {
@@ -290,6 +291,7 @@ const template = {
           bridge: "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], interpolate: '${operator} ${who} ${reminder}' }",
           justWhoBridge: "{ ...next(operator), bridge: 'justWhoBridge', operator: operator, who: after[0], interpolate: '${operator} ${who}' }",
           withDateBridge: "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], date: after[2], interpolate: '${operator} ${who} ${reminder} ${date}' }",
+          withDateFirstBridge: "{ ...next(operator), operator: operator, who: after[0], reminder: after[2], date: after[1], interpolate: '${operator} ${who} ${date} ${reminder}' }",
           withDateAndTimeBridge: "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], date: after[2], time: after[3], interpolate: '${operator} ${who} ${reminder} ${date} ${time}' }",
           semantics: [
             {