tpmkms_4wp 9.3.0-beta.22 → 9.3.0-beta.24

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} = {}) {
+  makeObject({config, context, types=[], source_value=undefined, doPluralize=true, initial=''} = {}) {
     if (typeof context == 'string') {
       context = { word: context, value: context }
     }
@@ -102,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',

package/common/reminders.js

@@ -16,9 +16,6 @@ const helpers = require('./helpers')
    remind greg to go to regina
    remind every truck driver to whatever tomorrow at 8 am
    remind greg and bob to go to bolivia and see the xyz corporation
-
-   remind me to go\nmonday at 10 am
-   remind me to go\non monday at 10 am
 */
 
 class API {
@@ -40,7 +37,8 @@ class API {
     if (!text) {
       text = id
     }
-    this.args.makeObject({ ...this.args, context: { word: text, value: id, number: 'one' }, types: ['remindable'] })
+    debugger
+    this.args.makeObject({ ...this.args, context: { word: text, value: id, number: 'one', remindee_id: id }, initial: `remindee_id: "${id}"`, types: ['remindable'] })
   }
 
   async instantiate(reminder) {
@@ -115,7 +113,7 @@ const template = {
           id: 'addRemindable',
           isA: ['verb'],
           development: true,
-          bridge: "{ ...next(operator), arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
+          bridge: "{ ...next(operator), flatten: true, arg: after[0], operator: operator, interpolate: '${operator} ${arg}' }",
           semantic: ({api, context}) => {
             const name = context.arg.map( (word) => word.text ).join(' ')
             api.addRemindable(name)
@@ -133,7 +131,7 @@ const template = {
           withDateAndTimeBridge: "{ ...next(operator), operator: operator, who: after[0], reminder: after[1], date: after[2], time: after[3], interpolate: '${operator} ${who} ${reminder} ${date} ${time}' }",
           semantic: async ({api, gsp, gp, context}) => {
             const text = await gsp(context.reminder.slice(1));
-            const who = { id: context.who.value || context.who.text, text: context.who.text }
+            const who = { id: context.who.value || context.who.text, text: context.who.text, remindee_id: context.who.remindee_id }
             const reminder = { text, dateTimeSelector: context.date, who }
             if (context.date) {
               reminder.dateTimeSelector = context.date
@@ -225,13 +223,13 @@ knowledgeModule( {
           filter: [ 
             'text', 
             'dateTimeSelectorText', 
-            'who',
             'nextISODate', 
+            'who', 
             'stm',
             {
               property: 'dateTimeSelector', 
               filter: ['marker', 'text', 'value'],
-            }
+            },
           ],
         }
       ],