ekms 9.5.1-beta.5 → 9.5.1-beta.7

package/common/conjunction.js

@@ -44,19 +44,26 @@ const config = {
     {
       where: where(),
       notes: 'handle lists with yes no',
-      // ({context, hierarchy}) => context.marker == 'list' && context.paraphrase && context.value,
-      // ({context, hierarchy}) => context.marker == 'list' && context.value,
       match: ({context, hierarchy}) => context.marker == 'list' && context.paraphrase && context.value && context.value.length > 0 && context.value[0].marker == 'yesno',
       apply: async ({context, g, gs}) => {
         return `${await g(context.value[0])} ${await gs(context.value.slice(1), ', ', ' and ')}`
       }
     },
 
+    /*
+    {
+      where: where(),
+      notes: 'handle lists with truthValue set',
+      match: ({context, hierarchy}) => context.marker == 'list' && context.hasOwnProperty('truthValue'),
+      apply: async ({context, g, gs}) => {
+        return context.truthValue ? 'yes' : 'no'
+      }
+    },
+    */
+
     {
       where: where(),
       notes: 'handle lists',
-      // ({context, hierarchy}) => context.marker == 'list' && context.paraphrase && context.value,
-      // ({context, hierarchy}) => context.marker == 'list' && context.value,
       match: ({context, hierarchy}) => context.marker == 'list' && context.value,
       apply: async ({context, gs}) => {
         if (context.newLinesOnly) {
@@ -69,7 +76,7 @@ const config = {
   ],
 };
 
-const initializer = ({objects, config, isModule}) => {
+function initializer({objects, config, isModule}) {
   config.addArgs(({config, api, hierarchy}) => {
     const isAI = isA(hierarchy);
 
@@ -82,6 +89,7 @@ const initializer = ({objects, config, isModule}) => {
         } 
       },
       asList,
+      toList: asList,
       toArray: propertyToArray,
       listable: listable(hierarchy),
       isA: isAI,

package/common/crew.instance.json

@@ -2400,7 +2400,7 @@
             "word": "name",
             "range": {
               "start": 0,
-              "end": 17
+              "end": 10
             },
             "dead": true,
             "types": [
@@ -4157,7 +4157,7 @@
             "word": "rank",
             "range": {
               "start": 0,
-              "end": 21
+              "end": 10
             },
             "dead": true,
             "types": [
@@ -5953,7 +5953,7 @@
             "word": "eyes",
             "range": {
               "start": 0,
-              "end": 19
+              "end": 10
             },
             "dead": true,
             "types": [
@@ -7737,7 +7737,7 @@
             "word": "kirk",
             "range": {
               "start": 0,
-              "end": 16
+              "end": 3
             },
             "dead": true,
             "types": [
@@ -9400,7 +9400,7 @@
             "word": "kirk",
             "range": {
               "start": 0,
-              "end": 20
+              "end": 3
             },
             "dead": true,
             "types": [
@@ -11157,7 +11157,7 @@
             "word": "rank",
             "range": {
               "start": 0,
-              "end": 21
+              "end": 11
             },
             "dead": true,
             "types": [
@@ -13072,7 +13072,7 @@
             "word": "name",
             "range": {
               "start": 0,
-              "end": 20
+              "end": 11
             },
             "dead": true,
             "types": [
@@ -14992,7 +14992,7 @@
             "word": "eyes",
             "range": {
               "start": 0,
-              "end": 21
+              "end": 11
             },
             "dead": true,
             "types": [
@@ -16870,7 +16870,7 @@
             "word": "spock",
             "range": {
               "start": 0,
-              "end": 16
+              "end": 4
             },
             "dead": true,
             "types": [
@@ -18618,7 +18618,7 @@
             "word": "spock",
             "range": {
               "start": 0,
-              "end": 21
+              "end": 4
             },
             "dead": true,
             "types": [
@@ -20460,7 +20460,7 @@
             "word": "rank",
             "range": {
               "start": 0,
-              "end": 21
+              "end": 11
             },
             "dead": true,
             "types": [
@@ -22469,7 +22469,7 @@
             "word": "name",
             "range": {
               "start": 0,
-              "end": 20
+              "end": 11
             },
             "dead": true,
             "types": [
@@ -24479,7 +24479,7 @@
             "word": "eyes",
             "range": {
               "start": 0,
-              "end": 21
+              "end": 11
             },
             "dead": true,
             "types": [
@@ -26463,7 +26463,7 @@
             "word": "mccoy",
             "range": {
               "start": 0,
-              "end": 21
+              "end": 4
             },
             "dead": true,
             "types": [
@@ -28309,7 +28309,7 @@
             "word": "mccoy",
             "range": {
               "start": 0,
-              "end": 16
+              "end": 4
             },
             "dead": true,
             "types": [
@@ -30217,7 +30217,7 @@
             "word": "status",
             "range": {
               "start": 0,
-              "end": 33
+              "end": 24
             },
             "dead": true,
             "types": [
@@ -34476,7 +34476,7 @@
             "word": "status",
             "range": {
               "start": 0,
-              "end": 42
+              "end": 33
             },
             "dead": true,
             "types": [
@@ -36986,7 +36986,7 @@
             "word": "phasers",
             "range": {
               "start": 0,
-              "end": 18
+              "end": 6
             },
             "dead": true,
             "types": [
@@ -38867,7 +38867,7 @@
             "word": "torpedoes",
             "range": {
               "start": 0,
-              "end": 20
+              "end": 8
             },
             "dead": true,
             "types": [
@@ -40742,7 +40742,7 @@
             "word": "kirk",
             "range": {
               "start": 0,
-              "end": 15
+              "end": 3
             },
             "dead": true,
             "types": [
@@ -42572,7 +42572,7 @@
             "word": "spock",
             "range": {
               "start": 0,
-              "end": 16
+              "end": 4
             },
             "dead": true,
             "types": [
@@ -44402,7 +44402,7 @@
             "word": "mccoy",
             "range": {
               "start": 0,
-              "end": 16
+              "end": 4
             },
             "dead": true,
             "types": [
@@ -46615,7 +46615,7 @@
               "word": "arm",
               "range": {
                 "start": 0,
-                "end": 13
+                "end": 2
               },
               "evaluateWord": true,
               "imperative": true,
@@ -46655,7 +46655,7 @@
               "word": "status",
               "range": {
                 "start": 21,
-                "end": 53
+                "end": 44
               },
               "dead": true,
               "types": [
@@ -50129,7 +50129,7 @@
               "word": "disarm",
               "range": {
                 "start": 0,
-                "end": 16
+                "end": 5
               },
               "evaluateWord": true,
               "imperative": true,
@@ -50169,7 +50169,7 @@
               "word": "status",
               "range": {
                 "start": 24,
-                "end": 60
+                "end": 47
               },
               "dead": true,
               "types": [

package/common/crew.js

@@ -37,7 +37,7 @@ const template = {
   ],
 };
 
-const initializer = ({config, apis}) => {
+function initializer({config, apis}) {
   const api = apis('properties')
   const conceptApi = apis('concept')
   // conceptApi.kindOfConcept({ config, modifiers: ['photon'], object: 'torpedo' })

package/common/currency.js

@@ -89,7 +89,7 @@ const config = {
   ],
 };
 
-const initializer = ({config, objects, apis, addWord, addGenerator, baseConfig, uuid}) => {
+function initializer({config, objects, apis, addWord, addGenerator, baseConfig, uuid}) {
   const api = apis('currency')
   units = api.getUnits()
   for (word in units) {

package/common/dates.instance.json

@@ -2972,7 +2972,7 @@
             "text": "january, february, march, april, may, june, july, august, september, october, november and december",
             "range": {
               "start": 0,
-              "end": 109
+              "end": 98
             },
             "types": [
               "list",
@@ -3401,6 +3401,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -11477,7 +11491,7 @@
             "text": "monday, tuesday, wednesday, thursday, friday, saturday and sunday",
             "range": {
               "start": 0,
-              "end": 73
+              "end": 64
             },
             "types": [
               "list",
@@ -11751,6 +11765,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -15659,7 +15687,7 @@
             "text": "ac, bc, bce and ad",
             "range": {
               "start": 0,
-              "end": 26
+              "end": 17
             },
             "types": [
               "list",
@@ -15840,6 +15868,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -18801,6 +18843,48 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "setIdSuffix",

package/common/dialogues.js

@@ -18,7 +18,7 @@ const pluralize = require('pluralize')
 
 const api = new API()
 
-const warningIsANotImplemented = (log, context) => {
+function warningIsANotImplemented(log, context) {
   const description = 'WARNING from Dialogues KM: For semantics in order to handle sentences of type "x is y?", set the response to what you like.'
   const match = `({context, hierarchy}) => hierarchy.isA(context.marker, 'is') && context.query && <other conditions as you like>`
   const apply = `({context}) => <do stuff...>; context.evalue = <value>`
@@ -27,7 +27,7 @@ const warningIsANotImplemented = (log, context) => {
   log(indent(message, 4))
 }
 
-const warningSameNotEvaluated = (log, one) => {
+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>`
   const apply = '({context}) => <do stuff... context.same is the other value>; context.sameWasProcessed = true'
@@ -36,7 +36,7 @@ const warningSameNotEvaluated = (log, one) => {
   log(indent(message, 4))
 }
 
-const listorama = (type) => {
+function listorama(type) {
   return [
       { context: [[type, 0], ['list', 0], [type, 0]], choose: 0 },
       { context: [[type, 1], ['list', 0], [type, 0]], choose: 0 },
@@ -245,6 +245,7 @@ const config = {
     { id: "canBeDoQuestion", level: 2, bridge: "{ ...next(operator) }" },
     { id: "doesAble", level: 0, bridge: "{ ...next(operator) }" },
     { id: "doesAble", level: 1, bridge: "{ ...next(operator), before: before[0] }" },
+    // { id: "does", level: 0, bridge: "{ query: true, wantsTruthValue: true, what: operator.marker, ...context, number: operator.number, object.number: operator.number }*" },
     { id: "does", level: 0, bridge: "{ query: true, what: operator.marker, ...context, number: operator.number, object.number: operator.number }*" },
 
     /*
@@ -369,11 +370,13 @@ const config = {
     {
       where: where(),
       notes: "handle making responses brief",
-      match: ({context, objects}) => (context.topLevel || context.isResponse) && objects.brief && !context.briefWasRun,
+      match: ({context, objects, callId}) => (context.topLevel || context.isResponse) && objects.brief && !context.briefWasRun,
       apply: async ({context, g}) => {
         const focussed = focus(context)
         context.briefWasRun = true
-        return await g(focussed)
+        const result = await g(focussed)
+        context.briefWasRun = false
+        return result
       },
       priority: -2,
     },
@@ -393,7 +396,7 @@ const config = {
       where: where(),
       notes: "be brief or wordy",
       match: ({context}) => context.marker == 'be',
-      apply: ({context}) => `be ${context.type.word}`,
+      apply: ({context}) => `be ${context.type?.word}`,
     },
     /*
     {
@@ -528,7 +531,7 @@ const config = {
           return `${await gp(context.one)} ${isMany(context.one) || isMany(context.two) || isMany(context) ? "are" : "is"} ${await g(context.two)}`
         }
 
-        const hasFocus = (property) => {
+        function hasFocus(property) {
           if (context.focusableForPhrase) {
             return true
           }
@@ -788,7 +791,7 @@ const config = {
   ],
 };
 
-const initializer = ({objects, config, isModule}) => {
+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),

package/common/dimension.instance.json

@@ -1135,7 +1135,7 @@
             "text": "dimension and unit",
             "range": {
               "start": 0,
-              "end": 30
+              "end": 17
             },
             "types": [
               "list",