ekms 9.6.3-beta.2 → 9.6.3-beta.21

package/common/math.instance.json

@@ -6,10 +6,10 @@
       "operators": [
         "([mathematicalExpression])",
         "([mathematical_operator])",
-        "(([number|]) [plusOperator] ([number|]))",
-        "(([number|]) [minusOperator] ([number|]))",
-        "(([number|]) [timesOperator] ([number|]))",
-        "(([number|]) [divideByOperator|] ([number|]))",
+        "((number/* || mathematicalExpression/*) [plusOperator] (number/* || mathematicalExpression/*))",
+        "((number/* || mathematicalExpression/*) [minusOperator] (number/* || mathematicalExpression/*))",
+        "((number/* || mathematicalExpression/*) [timesOperator] (number/* || mathematicalExpression/*))",
+        "((number/* || mathematicalExpression/*) [divideByOperator|] (number/* || mathematicalExpression/*))",
         "([plusExpression|])",
         "([minusExpression|])",
         "([timesExpression|])",
@@ -27,8 +27,7 @@
         {
           "id": "mathematicalExpression",
           "isA": [
-            "concept",
-            "number"
+            "concept"
           ]
         },
         {
@@ -1359,10 +1358,10 @@
       "operators": [
         "([mathematicalExpression])",
         "([mathematical_operator])",
-        "(([number|]) [plusOperator] ([number|]))",
-        "(([number|]) [minusOperator] ([number|]))",
-        "(([number|]) [timesOperator] ([number|]))",
-        "(([number|]) [divideByOperator|] ([number|]))",
+        "((number/* || mathematicalExpression/*) [plusOperator] (number/* || mathematicalExpression/*))",
+        "((number/* || mathematicalExpression/*) [minusOperator] (number/* || mathematicalExpression/*))",
+        "((number/* || mathematicalExpression/*) [timesOperator] (number/* || mathematicalExpression/*))",
+        "((number/* || mathematicalExpression/*) [divideByOperator|] (number/* || mathematicalExpression/*))",
         "([plusExpression|])",
         "([minusExpression|])",
         "([timesExpression|])",
@@ -1380,8 +1379,7 @@
         {
           "id": "mathematicalExpression",
           "isA": [
-            "concept",
-            "number"
+            "concept"
           ]
         },
         {

package/common/math.js

@@ -76,10 +76,10 @@ const config = {
   operators: [
     "([mathematicalExpression])",
     "([mathematical_operator])",
-    "(([number|]) [plusOperator] ([number|]))",
-    "(([number|]) [minusOperator] ([number|]))",
-    "(([number|]) [timesOperator] ([number|]))",
-    "(([number|]) [divideByOperator|] ([number|]))",
+    "((number/* || mathematicalExpression/*) [plusOperator] (number/* || mathematicalExpression/*))",
+    "((number/* || mathematicalExpression/*) [minusOperator] (number/* || mathematicalExpression/*))",
+    "((number/* || mathematicalExpression/*) [timesOperator] (number/* || mathematicalExpression/*))",
+    "((number/* || mathematicalExpression/*) [divideByOperator|] (number/* || mathematicalExpression/*))",
     "([plusExpression|])", 
     "([minusExpression|])", 
     "([timesExpression|])", 
@@ -91,7 +91,8 @@ const config = {
     { 
       id: "mathematicalExpression",
       // isA: ['queryable', 'theAble'],
-      isA: ['concept', 'number'],
+      //isA: ['concept', 'number'],
+      isA: ['concept'],
     },
     { 
       id: "mathematical_operator", 

package/common/menus.instance.json

@@ -517,11 +517,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -1856,11 +1851,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -3379,11 +3369,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -4992,11 +4977,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -6521,11 +6501,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -8508,11 +8483,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -9959,11 +9929,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",

package/common/meta.js

@@ -254,7 +254,7 @@ const config = {
                       valuesPrime.push(valuePrime)
                     }
                   }
-                  response = { marker: 'list', truthValue: valuesPrime.length > 0, value: unflatten(valuesPrime, context.flatten || []) }
+                  response = { marker: 'list', listable: true, truthValue: valuesPrime.length > 0, value: unflatten(valuesPrime, context.flatten || []) }
                 } else {
                   const toPrime = toPrimes[0][0]
                   response = toPrime.evalue

package/common/nameable.js

@@ -19,12 +19,12 @@ class API {
     context.namespaced.nameable ??= {}
     context.namespaced.nameable.names ??= []
     context.namespaced.nameable.names.push(name)
-    this.args.config.addWord(name, { id: context.marker, initial: `{ value: "${name}", pullFromContext: true, nameable_named: true }` })
+    this.args.config.addWord(name, { id: context.marker, initial: `{ value: "${name}", pullFromContext: true, nameable_named: true, instance: ${context.instance ? 'true' : 'false'} }` })
   }
 
   // used by mongo km
   get(type, name) {
-    return this.args.kms.stm.api.mentions({ 
+    return this.args.kms.stm.api.recall({ 
       context: type, 
       condition: (context) => {
         if (context.namespaced?.nameable && context.namespaced.nameable.names) {
@@ -54,16 +54,16 @@ class API {
   setCurrent(name) {
     const context = this.objects.named[name]
     if (context) {
-      this.args.km('stm').api.mentioned({ context })
+      this.args.km('stm').api.remember({ context })
     }
   }
 }
 
 function initializer({config}) {
-  config.addArgs(({kms, mentioned}) => {
+  config.addArgs(({kms, remember}) => {
     return {
-      mentioned: (args) => {
-        mentioned(args)
+      remember: (args) => {
+        remember(args)
         if (args.name) {
           kms.nameable.api.setName(args.context, args.name)
         }
@@ -124,8 +124,6 @@ const config = {
       `,
       // generatorp: async ({context, g, gs}) => `call ${await g(context.nameable)} ${await gs(context.name)}`,
       semantic: async ({config, context, api, e, verbatim, g}) => {
-        // TODO find report being referred to
-        // debugger
         const nameable = (await e(context.nameable))?.evalue
         if (!nameable) {
           verbatim(`${await g(context.nameable)} is not known`)
@@ -158,7 +156,7 @@ const config = {
   semantics: [
     {
       where: where(),
-      match: ({context}) => context.marker == 'mentions' && context.evaluate && context.args.context.nameable_named,
+      match: ({context}) => context.marker == 'mentions' && context.evaluate && context.args?.context?.nameable_named,
       apply: async ({callId, _continue, toList, context, kms, e, log, retry}) => {
         context.args.condition ??= () => true
         const oldCondition = context.args.condition

package/common/ordinals.js

@@ -34,11 +34,45 @@ const config = {
   semantics: [
     {
       where: where(),
-      match: ({context}) => context.marker == 'mentions' && context.evaluate,
-      apply: async ({callId, _continue, toList, context, kms, e, log, retry}) => {
-        if (context.args?.context?.ordinal?.marker == 'ordinal' && context.args?.context?.ordinal?.value == -1) {
-          const lastN = context.args.context.quantity?.value || 1
-          context.args.lastN = lastN
+      match: ({context}) => context.marker == 'mentions' && context.evaluate && context.args?.context?.ordinal,
+      apply: async ({callId, _continue, toList, context, kms, e, log, toArray, retry}) => {
+        // const ordinals = toArray(context.args?.context?.ordinal)
+        const lastNotFirst = context.args?.context?.ordinal.value < 0
+        const quantity = context.args.context.quantity?.value || 1
+        context.args.filter ??= (r) => r
+        context.args.all = true
+        const oldFilter = context.args.filter
+        context.args.filter = (result) => {
+          const reversed = context.args.frameOfReference?.namespaced?.stm?.reversed
+          let selected = []
+          for (const ordinal of toArray(context.args?.context?.ordinal)) {
+            if (context.args.context.quantity) {
+              if (lastNotFirst) {
+                if (reversed) {
+                  selected = selected.concat(result.slice(-quantity))
+                } else {
+                  selected = selected.concat(result.slice(0, quantity).reverse())
+                }
+              } else {
+                if (!reversed) {
+                  selected = selected.concat(result.slice(-quantity).reverse())
+                } else {
+                  selected = selected.concat(result.slice(0, quantity))
+                }
+              }
+            } else {
+              let point
+              if (ordinal.value > 0) {
+                point = result[ordinal.value-1]
+              } else {
+                point = result[result.length + ordinal.value]
+              }
+              if (point) {
+                selected.push(point)
+              }
+            }
+          }
+          return oldFilter(selected)
         }
         _continue()
       }
@@ -53,6 +87,18 @@ const config = {
       "2nd": [{"id": "ordinal", "initial": "{ value: 2, ordinal: true, instance: true }" }],
       "third": [{"id": "ordinal", "initial": "{ value: 3, ordinal: true, instance: true }" }],
       "3rd": [{"id": "ordinal", "initial": "{ value: 3, ordinal: true, instance: true }" }],
+      "fourth": [{"id": "ordinal", "initial": "{ value: 4, ordinal: true, instance: true }" }],
+      "4rd": [{"id": "ordinal", "initial": "{ value: 4, ordinal: true, instance: true }" }],
+      "fifth": [{"id": "ordinal", "initial": "{ value: 5, ordinal: true, instance: true }" }],
+      "5th": [{"id": "ordinal", "initial": "{ value: 5, ordinal: true, instance: true }" }],
+      "sixth": [{"id": "ordinal", "initial": "{ value: 6, ordinal: true, instance: true }" }],
+      "6th": [{"id": "ordinal", "initial": "{ value: 6, ordinal: true, instance: true }" }],
+      "seventh": [{"id": "ordinal", "initial": "{ value: 7, ordinal: true, instance: true }" }],
+      "7th": [{"id": "ordinal", "initial": "{ value: 7, ordinal: true, instance: true }" }],
+      "eigth": [{"id": "ordinal", "initial": "{ value: 8, ordinal: true, instance: true }" }],
+      "8th": [{"id": "ordinal", "initial": "{ value: 8, ordinal: true, instance: true }" }],
+      "ninth": [{"id": "ordinal", "initial": "{ value: 9, ordinal: true, instance: true }" }],
+      "9th": [{"id": "ordinal", "initial": "{ value: 9, ordinal: true, instance: true }" }],
     },
     patterns: [
       { "pattern": [{ type: 'digit' }, { repeat: true }, 'th'], defs: [{id: "ordinal", uuid: '1', initial: "{ value: int(substr(text, -2)), ordinal: true, instance: true }" }]},

package/common/pipboy.instance.json

@@ -907,11 +907,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -3337,11 +3332,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -5212,11 +5202,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -6913,11 +6898,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -9064,11 +9044,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -10825,11 +10800,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -13186,11 +13156,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -15288,11 +15253,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -17274,11 +17234,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -19402,11 +19357,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -21519,11 +21469,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -23717,11 +23662,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -25919,11 +25859,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -28448,11 +28383,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -31067,11 +30997,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -33747,11 +33672,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",
@@ -36300,11 +36220,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",

package/common/pipboy.js

@@ -417,7 +417,7 @@ const config = {
        generatorp: ({context, g}) => `${context.marker} ${g(context.type)}`,
        isA: ['verby'],
        semantic: ({context, kms}) => {
-         kms.dialogues.api.mentioned({
+         kms.dialogues.api.remember({
            marker: context.type.marker,
            value: context.type.marker
          })