ekms 9.8.0-beta.2 → 9.8.0-beta.4

package/common/scorekeeper.js

@@ -204,7 +204,7 @@ const config = {
     },
     {
       where: where(),
-      match: ({context}) => context.marker == 'turn' && context.evaluate && context.whose,
+      match: ({context}) => context.marker == 'turn' && context.whose,
       apply: ({context, objects}) => {
         if (Number.isInteger(objects.nextPlayer)) {
           context.evalue = `${objects.players[objects.nextPlayer]}'s turn`
@@ -215,7 +215,7 @@ const config = {
     },
     {
       where: where(),
-      match: ({context}) => context.marker == 'unify' && context.evaluate && context.terms[0].whose,
+      match: ({context}) => context.marker == 'unify' && context.terms[0].whose,
       apply: ({context, objects}) => {
         if (Number.isInteger(objects.nextPlayer)) {
           context.evalue = `${objects.players[objects.nextPlayer]}'s turn` 
@@ -226,7 +226,7 @@ const config = {
     },
     {
       where: where(),
-      match: ({context}) => context.marker == 'next' && context.evaluate,
+      match: ({context}) => context.marker == 'next',
       apply: ({context, objects}) => {
         if (Number.isInteger(objects.nextPlayer)) {
           context.evalue = objects.players[objects.nextPlayer]
@@ -237,7 +237,7 @@ const config = {
     },
     {
       where: where(),
-      match: ({context}) => context.marker == 'player' && context.evaluate && context.pullFromContext,
+      match: ({context}) => context.marker == 'player' && context.pullFromContext,
       apply: async ({context, objects, gs}) => {
         const players = objects.players
         if (players.length == 0) {
@@ -257,7 +257,7 @@ const config = {
     },
     {
       where: where(),
-      match: ({context}) => context.marker == 'score' && context.evaluate && context.winning,
+      match: ({context}) => context.marker == 'score' && context.winning,
       apply: ({context, objects}) => {
         //context.value = { marker: 'point', value: objects.winningScore }
         // i got the value by running -q '20 points'
@@ -280,7 +280,7 @@ const config = {
     },
     {
       where: where(),
-      match: ({context}) => context.marker == 'score' && context.evaluate,
+      match: ({context}) => context.marker == 'score',
       apply: ({context, objects}) => {
         const players = Object.keys(objects.scores);
         let allScoresAreZero = true

package/common/stm.js

@@ -288,9 +288,9 @@ const config = {
       id: 'recall', 
       bridge: "{ ...next(operator), postModifiers: ['recallee'], recallee: after[0] }",
       isA: ['verb'],
-      semantic: async ({context, recall, resolveResponse, e}) => {
+      semantic: async ({context, recall, resolveEvaluate, e}) => {
         const object = await recall({ context: context.recallee })
-        resolveResponse(context, object)
+        resolveEvaluate(context, object)
       },
     },
     { 
@@ -324,7 +324,7 @@ const config = {
   semantics: [
     {
       where: where(),
-      match: ({context}) => context.marker == 'mentions' && context.evaluate && context.args?.context?.distributer,
+      match: ({context}) => context.marker == 'mentions' && context.args?.context?.distributer,
       apply: async ({callId, _continue, toList, context, kms, e, log, toArray, retry}) => {
         context.args.filter ??= (r) => r
         context.args.all = true
@@ -337,7 +337,7 @@ const config = {
     },
     {
       where: where(),
-      match: ({context}) => context.marker == 'mentions' && context.evaluate,
+      match: ({context}) => context.marker == 'mentions',
       apply: ({context, kms, toList, resolveEvaluate}) => {
         const value = kms.stm.api.recall(context.args)
         if (value) {
@@ -366,7 +366,7 @@ const config = {
         }
 
         if (!context.value) {
-          context.evalue = { marker: 'answerNotKnown' }
+          context.evalue = { marker: 'undefined' }
           return
         }
       
@@ -375,9 +375,7 @@ const config = {
           if (instance.evalue && !instance.edefault) {
             context.value = instance.evalue
           }
-          if (context.evaluate) {
-            context.evalue = context.value
-          }
+          context.evalue = context.value
         } else {
           await s(context.value)
         }

package/common/time.instance.json

@@ -185,7 +185,7 @@
       },
       "generators": [
         {
-          "match": "({context}) => context.marker == 'timePoint' && context.evalue && context.format == 12",
+          "match": "({context}) => context.marker == 'timePoint' && context.evalue && context.format == 12 && !context.paraphrase",
           "apply": "({context}) => {\n            let hh = context.evalue.getHours();\n            let ampm = 'am'\n            if (hh > 12) {\n              hh -= 12;\n              ampm = 'pm'\n            }\n            let ss = context.evalue.getMinutes()\n            ss = pad(ss, 2)\n            return `${hh}:${ss} ${ampm}` \n          }"
         },
         {
@@ -203,7 +203,7 @@
           "apply": "async ({context, e, s, handlerStack}) => {\n            const v = (await e(context.repeats.repeats)).evalue\n            for (let i = 0; i < v; ++i) {\n              if (context.action) {\n                await s(context.action)\n              } else {\n                const repeats = context.repeats\n                context.repeats = undefined\n                await s(context)\n                context.repeats = repeats\n              }\n            }\n          }"
         },
         {
-          "match": "({objects, context, api}) => context.marker == 'timePoint' && context.evaluate",
+          "match": "({objects, context, api}) => context.marker == 'timePoint' && !context.isInstance",
           "apply": "({objects, context, api}) => {\n            context.evalue = api.newDate()\n            context.format = objects.format\n          }"
         },
         {

package/common/time.js

@@ -170,7 +170,7 @@ const template = {
       generators: [
         { 
           where: where(),
-          match: ({context}) => context.marker == 'timePoint' && context.evalue && context.format == 12, 
+          match: ({context}) => context.marker == 'timePoint' && context.evalue && context.format == 12 && !context.paraphrase, 
           apply: ({context}) => {
             let hh = context.evalue.getHours();
             let ampm = 'am'
@@ -225,7 +225,7 @@ const template = {
         {
           notes: 'evaluate time',
           where: where(),
-          match: ({objects, context, api}) => context.marker == 'timePoint' && context.evaluate, 
+          match: ({objects, context, api}) => context.marker == 'timePoint' && !context.isInstance,
           apply: ({objects, context, api}) => {
             context.evalue = api.newDate()
             context.format = objects.format

package/common/wp.instance.json

@@ -956,11 +956,11 @@
       ],
       "semantics": [
         {
-          "match": "({context, isA}) => isA(context, 'style_wp') && !context.same && !context.isResponse && !context.evaluate",
+          "match": "({context, isA}) => isA(context, 'style_wp') && !context.same && !context.isResponse",
           "apply": "({context, api, isA, toArray}) => {\n            const update = { scope: 'selection' }\n            setUpdate(isA, update, toArray(context))\n            api.changeState(update)\n          }"
         },
         {
-          "match": "({context, isA}) => isA(context, 'statefulElement_wp') && !context.same && !context.isResponse && !context.evaluate",
+          "match": "({context, isA}) => isA(context, 'statefulElement_wp') && !context.same && !context.isResponse",
           "apply": "({context, api, isA, toArray}) => {\n            const unit = root(context.marker)\n            let scope\n            if (context.quantity) {\n              scope = context.quantity.quantity\n            }\n            // TODO set default scope for \"every word bold underlined etc\"\n          }"
         }
       ],

package/common/wp.js

@@ -450,7 +450,7 @@ template = {
       semantics: [
         {
           where: where(),
-          match: ({context, isA}) => isA(context, 'style_wp') && !context.same && !context.isResponse && !context.evaluate,
+          match: ({context, isA}) => isA(context, 'style_wp') && !context.same && !context.isResponse,
           apply: ({context, api, isA, toArray}) => {
             const update = { scope: 'selection' }
             setUpdate(isA, update, toArray(context))
@@ -459,7 +459,7 @@ template = {
         },
         {
           where: where(),
-          match: ({context, isA}) => isA(context, 'statefulElement_wp') && !context.same && !context.isResponse && !context.evaluate,
+          match: ({context, isA}) => isA(context, 'statefulElement_wp') && !context.same && !context.isResponse,
           apply: ({context, api, isA, toArray}) => {
             const unit = root(context.marker)
             let scope

package/package.json

@@ -402,8 +402,8 @@
     "scriptjs": "^2.5.9",
     "table": "^6.7.1",
     "uuid": "^9.0.0",
-    "theprogrammablemind": "9.8.0-beta.2"
+    "theprogrammablemind": "9.8.0-beta.4"
   },
-  "version": "9.8.0-beta.2",
+  "version": "9.8.0-beta.4",
   "license": "UNLICENSED"
 }