tpmkms 9.8.0-beta.8 → 9.9.0

package/common/conjunction.js

@@ -39,11 +39,13 @@ const config = {
           passthrough: true
      }, 
       bridge: "{ ...operator, value: append(before, operator.value) }",
+      where: where(),
       semantic: {
         match: ({context, namespaced}) => !namespaced.get('conjunction', context, 'atomic'),
-        apply: async ({context, flatten, s}) => {
+        apply: async ({context, flatten, e}) => {
           for (const value of flatten(context)) {
-            await s(value)
+            value.topLevel = context.topLevel;
+            await e(value, where())
           }
         }
       }
@@ -53,11 +55,11 @@ const config = {
     {
       where: where(),
       notes: 'evaluate elements of the list individually',
-      match: ({context, callId}) => context.marker == 'list' && context.evaluate,
+      match: ({context, callId}) => context.marker == 'list' && !context.topLevel,
       apply: async ({context, toArray, toList, e, resolveEvaluate}) => {
         const list = []
         for (const element of toArray(context)) {
-          list.push(await e(element))
+          list.push(await e(element, where()))
         }
         resolveEvaluate(context, toList(list))
       }

package/common/control.js

@@ -3,8 +3,11 @@ const tests = require('./control.test.json')
 
 function initializer({config}) {
   config.addArgs((args) => ({
-    callOnce: (args, tag, condition) => {
-      if (condition(args)) {
+    callOnce: async (args, tag, condition) => {
+      if (args.context.control?.seen[tag]) {
+        return false
+      }
+      if (await condition(args)) {
         const { context } = args
 
         if (!context.control) {
@@ -12,9 +15,6 @@ function initializer({config}) {
             seen: {},
           }
         }
-        if (context.control.seen[tag]) {
-          return false
-        }
         context.control.seen[tag] = true
 
         args._finally( () => {

package/common/countable.js

@@ -98,6 +98,7 @@ const config = {
     },
     { 
       id: "all", 
+      where: where(),
       generatorp: ({context}) => 'all',
       bridge: "{ ...next(operator), number: 'many', quantity: 'all' }" 
     },

package/common/dateTimeSelectors.instance.json

@@ -68,7 +68,7 @@
       "semantics": [
         {
           "match": "({context, isA}) => onOrIs('dayAfterDate', context)",
-          "apply": "async ({context, isProcess, isTest, kms, isA, e}) => {\n            try {\n              const now = kms.time.api.now()\n              const date = afterOrIs('dayAfterDate', context)\n              const afterISO = (await e(date.after)).evalue\n              const day_ordinal = date.day.day_ordinal\n              const ordinal = date.day.ordinal.value\n              context.evalue = dateTimeSelectors_helpers.getNthWeekdayAfterDate(afterISO, day_ordinal, ordinal)\n            } catch ( e ) {\n              context.evalue = `Implement instatiate for this type of date, ${context.marker}. See the dateTimeSelectors KM ${where()}. ${e}`\n            }\n          }"
+          "apply": "async ({context, isProcess, isTest, kms, isA, e}) => {\n            try {\n              const now = kms.time.api.now()\n              const date = afterOrIs('dayAfterDate', context)\n              const afterISO = (await e(date.after, where())).evalue\n              const day_ordinal = date.day.day_ordinal\n              const ordinal = date.day.ordinal.value\n              context.evalue = dateTimeSelectors_helpers.getNthWeekdayAfterDate(afterISO, day_ordinal, ordinal)\n            } catch ( e ) {\n              context.evalue = `Implement instatiate for this type of date, ${context.marker}. See the dateTimeSelectors KM ${where()}. ${e}`\n            }\n          }"
         },
         {
           "match": "({context, isA}) => onOrIs('dayOfMonth', context)",

package/common/dateTimeSelectors.js

@@ -99,7 +99,7 @@ const template = {
             try {
               const now = kms.time.api.now()
               const date = afterOrIs('dayAfterDate', context)
-              const afterISO = (await e(date.after)).evalue
+              const afterISO = (await e(date.after, where())).evalue
               const day_ordinal = date.day.day_ordinal
               const ordinal = date.day.ordinal.value
               context.evalue = dateTimeSelectors_helpers.getNthWeekdayAfterDate(afterISO, day_ordinal, ordinal)

package/common/dates.instance.json

@@ -184,6 +184,7 @@
         },
         {
           "id": "dateEra_dates",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dates.js:129",
           "isA": [
             "date_dates"
           ],
@@ -215,6 +216,7 @@
         },
         {
           "id": "monthDayYearWithSlashes_dates",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dates.js:143",
           "isA": [
             "date_dates"
           ],
@@ -266,6 +268,7 @@
         },
         {
           "id": "monthDay_dates",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dates.js:170",
           "convolution": true,
           "localHierarchy": [
             [
@@ -300,6 +303,7 @@
         },
         {
           "id": "monthYear_dates",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dates.js:181",
           "convolution": true,
           "before": [
             "preposition"
@@ -328,6 +332,7 @@
         },
         {
           "id": "monthDayYear_dates",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dates.js:191",
           "convolution": true,
           "before": [
             "preposition",
@@ -336,7 +341,7 @@
           "isA": [
             "date_dates"
           ],
-          "evaluator": "({context}) => {\n            const year = context.year.value\n            const day = context.day.value\n            const month_ordinal = context.month.month_ordinal\n            context.evalue = new Date(year, month_ordinal-1, day).toISOString()\n          }",
+          "semantic": "({context}) => {\n            const year = context.year.value\n            const day = context.day.value\n            const month_ordinal = context.month.month_ordinal\n            context.evalue = new Date(year, month_ordinal-1, day).toISOString()\n          }",
           "localHierarchy": [
             [
               "ordinal",
@@ -15147,6 +15152,7 @@
         },
         {
           "id": "dateEra_dates",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dates.js:129",
           "isA": [
             "date_dates"
           ],
@@ -15177,6 +15183,7 @@
         },
         {
           "id": "monthDayYearWithSlashes_dates",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dates.js:143",
           "isA": [
             "date_dates"
           ],
@@ -15227,6 +15234,7 @@
         },
         {
           "id": "monthDay_dates",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dates.js:170",
           "convolution": true,
           "localHierarchy": [
             [
@@ -15260,6 +15268,7 @@
         },
         {
           "id": "monthYear_dates",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dates.js:181",
           "convolution": true,
           "before": [
             "preposition"
@@ -15287,6 +15296,7 @@
         },
         {
           "id": "monthDayYear_dates",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dates.js:191",
           "convolution": true,
           "before": [
             "preposition",

package/common/dates.js

@@ -126,6 +126,7 @@ const template = {
         },
         { 
           id: 'dateEra_dates', 
+          where: where(),
           isA: ['date_dates'],
           convolution: true,
           bridge: "{ ...next(after[0]), era: after[1], interpolate: concat(after[0].interpolate, ' ${era}') }",
@@ -139,6 +140,7 @@ const template = {
         },
         { 
           id: 'monthDayYearWithSlashes_dates', 
+          where: where(),
           isA: ['date_dates'],
           before: ['preposition'],
           separators: "||||",
@@ -165,6 +167,7 @@ const template = {
         },
         { 
           id: 'monthDay_dates', 
+          where: where(),
           convolution: true,
           localHierarchy: [['ordinal', 'dayNumber_dates']],
           before: ['preposition'],
@@ -175,6 +178,7 @@ const template = {
         },
         { 
           id: 'monthYear_dates', 
+          where: where(),
           convolution: true,
           before: ['preposition'],
           isA: ['date_dates'],
@@ -184,10 +188,11 @@ const template = {
         },
         { 
           id: 'monthDayYear_dates', 
+          where: where(),
           convolution: true,
           before: ['preposition', 'monthDay_dates'],
           isA: ['date_dates'],
-          evaluator: ({context}) => {
+          semantic: ({context}) => {
             const year = context.year.value
             const day = context.day.value
             const month_ordinal = context.month.month_ordinal

package/common/debug.instance.json

@@ -8,11 +8,13 @@
       "bridges": [
         {
           "id": "setdebugbreak",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/debug.js:16",
           "bridge": "{\n            ...next(operator),\n            tag: after[0]\n          }",
           "semantic": "({context, debug}) => {\n            debug.hit(context.tag.word)\n          }"
         },
         {
           "id": "debugger",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/debug.js:27",
           "semantic": "(args) => {\n            debugger // eslint-disable-line no-debugger\n            debugger // eslint-disable-line no-debugger\n          }"
         }
       ]
@@ -28,10 +30,12 @@
       "bridges": [
         {
           "id": "setdebugbreak",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/debug.js:16",
           "bridge": "{\n            ...next(operator),\n            tag: after[0]\n          }"
         },
         {
-          "id": "debugger"
+          "id": "debugger",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/debug.js:27"
         }
       ]
     }

package/common/debug.js

@@ -13,6 +13,7 @@ const template = {
       bridges: [
         { 
           id: 'setdebugbreak',
+          where: where(),
           bridge: `{
             ...next(operator),
             tag: after[0]
@@ -23,6 +24,7 @@ const template = {
         },
         {
           id: 'debugger',
+          where: where(),
           semantic: (args) => {
             debugger // eslint-disable-line no-debugger
             debugger // eslint-disable-line no-debugger

package/common/dialogues.js

@@ -57,6 +57,7 @@ const config = {
 
     "(<what> ([whatAble|]))",
     "([what:optional])",
+    "([who])",
 
     "([be] ([briefOrWordy|]))",
 
@@ -110,6 +111,7 @@ const config = {
     },
     {
       id: 'makeObject',
+      where: where(),
       bridge: "{ ...next(operator), object: after[0] }",
       enhanced_associations: false,
       generatorp: async ({context, gp}) => `${context.word} ${await gp(context.object)}`,
@@ -119,6 +121,7 @@ const config = {
     },
     {
       id: 'setIdSuffix',
+      where: where(),
       enhanced_associations: false,
       bridge: "{ ...next(operator), suffix: after[0] }",
       generatorp: async ({context, gp}) => `${context.word} ${await gp(context.suffix)}`,
@@ -128,6 +131,7 @@ const config = {
     },
     {
       id: 'resetIdSuffix',
+      where: where(),
       semantic: ({context, api}) => {
         api.setIdSuffix('')
       }
@@ -142,9 +146,15 @@ const config = {
 
     { 
       id: "what", 
+      isA: ['queryable'],
       optional: "{ ...next(operator), query: ['what'], determined: true, isVariable: true }", 
       bridge: "{ ...after, query: ['what'], modifiers: ['what'], what: operator, isVariable: true }" 
     },
+    {
+      id: "who",
+      isA: ['queryable'],
+      initial: { query: true, isVariable: true },
+    },
     { id: "whatAble" },
 
     // context.isInstance == variables.isInstance (unification)
@@ -226,7 +236,7 @@ const config = {
     "literals": {
       "?": [{"id": "questionMark", "initial": "{}" }],
       // TODO make who its own concept
-      "who": [{"id": "what", "initial": "{ modifiers: [], query: true }" }],
+      // "who": [{"id": "what", "initial": "{ modifiers: [], query: true }" }],
       "yes": [{"id": "yesno", "initial": "{ value: true }" }],
       "no": [{"id": "yesno", "initial": "{ value: false }" }],
       "brief": [{"id": "briefOrWordy", "initial": "{ value: 'brief' }" }],
@@ -266,7 +276,6 @@ const config = {
     ['the', 'article'],
     ['theAble', 'queryable'],
     ['it', 'queryable'],
-    ['what', 'queryable'],
     ['whatAble', 'queryable'],
     ['negatable', 'queryable'],
     ['is', 'canBeQuestion'],
@@ -405,7 +414,9 @@ const config = {
     },
     { 
       where: where(),
-      match: ({context, hierarchy}) => hierarchy.isA(context.marker, 'canBeQuestion') && context.paraphrase && context.topLevel && context.query,
+      match: ({context, hierarchy, debug}) => {
+        return hierarchy.isA(context.marker, 'canBeQuestion') && context.paraphrase && context.topLevel && context.query
+      },
       apply: async ({context, gp}) => {
         return `${await gp({...context, topLevel: undefined})}?` 
       },
@@ -486,6 +497,9 @@ const config = {
         if (focus == 'one' && isA(context[focus], 'thisitthat')) {
           focus = other
         }
+        if (focus == 'two' && context[other].isPropertyValue) {
+          focus = other
+        }
         // greg101
         if (focus == 'one') {
           let number = 'one'
@@ -509,11 +523,12 @@ const config = {
     {
       where: where(),
       match: ({context}) => {
-        return context.evaluate && context.marker == 'unify' && context.terms.some((term) => term.marker == 'what')
+        return context.marker == 'unify' && context.terms.some((term) => ['what', 'who'].includes(term.marker))
       },
-      apply: async ({context, resolveEvaluate, toEValue}) => {
-        const value = context.terms.find((term) => term.marker !== 'what')
-        await resolveEvaluate(context, value)
+      apply: async ({context, resolveEvaluate, e, toFinalValue}) => {
+        const value = context.terms.find((term) => !['what', 'who'].includes(term.marker))
+        instance = await e(value, where())
+        await resolveEvaluate(context, instance)
       }
     },
     { 
@@ -528,9 +543,10 @@ const config = {
       where: where(),
       match: ({context}) => context.marker === 'error',
       apply: async ({context, g, gp}) => {
-        context.evalue = "That is not known"
         if (context.reason) {
-          context.evalue += ` because ${await g(context.reason)}`
+          context.evalue = `${await g(context.reason)}`
+        } else {
+          context.evalue = "That is not known"
         }
         context.isResponse = true
       }
@@ -585,7 +601,12 @@ const config = {
           value = one;
         }
 
-        let instance = await e(value)
+        const unification = await e({
+          marker: 'unify',
+          terms: [query, value],
+        }, where())
+        instance = unification.evalue || { marker: 'undefined' }
+
         if (instance.verbatim) {
           context.evalue = { verbatim: instance.verbatim }
           context.isResponse = true
@@ -598,16 +619,6 @@ const config = {
           return
         }
 
-        if (true) {
-          if (query.query || value.query) {
-            const unification = await e({
-              marker: 'unify',
-              terms: [query, instance],
-            })
-            instance = unification.evalue
-          }
-        }
-
         const concept = _.cloneDeep(value) 
         concept.isQuery = undefined
         instance.focus = true
@@ -625,10 +636,7 @@ const config = {
           word: many ? "are" : "is",
           number: many ? "many" : undefined,
         }
-        if (false) {
-          evalue.one = instance
-          evalue.two = concept
-        }
+
         context.evalue = evalue
         context.isResponse = true
       }
@@ -662,7 +670,7 @@ const config = {
       where: where(),
       notes: 'x is y. handles x is a kind of y or x = y in the stm',
       match: ({context}) => context.marker == 'is' && !context.query && context.one && context.two,
-      apply: async ({_continue, context, s, debug, log, api, kms, config}) => {
+      apply: async ({_continue, context, e, debug, log, api, kms, config}) => {
         function warningSameNotEvaluated(log, one) {
           const description = 'WARNING from Dialogues KM: For the "X is Y" type phrase implement a same handler.'
           const match = `({context}) => context.marker == '${one.marker}' && context.same && <other conditions as you like>`
@@ -674,7 +682,7 @@ const config = {
 
         const one = context.one;
         const two = context.two;
-        const onePrime = await s({ marker: 'same', one: one, two: two })
+        const onePrime = await e({ marker: 'same', one: one, two: two }, where())
         if (!onePrime.sameWasProcessed) {
           warningSameNotEvaluated(log, one)
         } else {
@@ -706,14 +714,13 @@ const config = {
     {
       where: where(),
       notes: 'get variable from stm',
-      match: ({context, kms}) => context.evaluate && kms.stm.api.getVariable(context),
-      // match: ({context, kms}) => context.evaluate,
+      match: ({context, kms}) => kms.stm.api.getVariable(context),
       priority: -1,
       apply: async ({context, kms, e}) => {
         const api = kms.stm.api
         context.value = api.getVariable(context)
         if (context.value && context.value.marker) {
-          context.evalue = await e(context.value)
+          context.evalue = await e(context.value, where())
         }
         context.focusableForPhrase = true
       }
@@ -722,11 +729,6 @@ const config = {
 };
 
 function initializer({objects, config, isModule}) {
-  /* TODO add this beck in. some stuff from config needs to be here
-  config.addArgs((args) => ({ 
-    e: (context) => config.api.getEvaluator(args.s, args.log, context),
-  }))
-  */
   config.addArgs(({config, api, isA, e}) => ({ 
     toScopedId: (context) => {
       return api('dialogues').toScopedId(context)
@@ -741,7 +743,7 @@ function initializer({objects, config, isModule}) {
       const unification = await e({
         marker: 'unify',
         terms: [term1, term2],
-      })
+      }, where())
       return unification?.evalue
     }
   }))