ekms 9.6.3-beta.2 → 9.6.3-beta.4

package/common/fastfood.js

@@ -893,7 +893,7 @@ class State {
       }
 
       this.api.add(item)
-      this.api.args.mentioned({ context: food })
+      this.api.args.remember({ context: food })
 
       for (const addIt of addsInsteadOfModifications) {
         this.add(addIt)

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)
         }

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.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
          })

package/common/properties.js

@@ -485,6 +485,7 @@ const config = {
                           !(context.types || []).includes('property') &&
                           // !context.value &&  // greghere
                           !context.ordinal &&
+                          (!context.objects || context.objects.length !== 2 || !context.objects[1].instance) &&
                           (api.objects && api.objects.children && api.objects.children[context.marker]) &&
                           !context.evaluate.toConcept,
       apply: ({context, objects, api, km}) => {
@@ -625,7 +626,7 @@ const config = {
                       !context.evaluate.toConcept, // && !context.value,
                       // greghere
       // match: ({context, hierarchy}) => hierarchy.isA(context.marker, 'property') && context.evaluate,
-      apply: async ({callId, context, api, kms, objects, g, s, log, mentions}) => {
+      apply: async ({callId, context, api, kms, objects, g, s, log, recall}) => {
         const toDo = [ ...context.objects ]
 
         async function toValue(objectContext) {
@@ -666,7 +667,7 @@ const config = {
 
           let fromMentions
           if (!await api.knownProperty(currentContext, nextContext)) {
-            fromMentions = await mentions({ context: nextContext, frameOfReference: currentContext })
+            fromMentions = await recall({ context: nextContext, all: nextContext.number == 'many', frameOfReference: currentContext })
             if (!fromMentions) {
               context.verbatim = `There is no property ${await g({...nextContext, paraphrase: true})} of ${await g({...currentContext, paraphrase: true})}`
               return

package/common/rates.instance.json

@@ -20,7 +20,7 @@
       "semantics": [
         {
           "match": "({context}) => context.marker == 'convertToUnits' && context.evaluate && (context.from?.unit?.marker == 'unitPerUnit' || context.to.marker == 'unitPerUnit')",
-          "apply": "async ({mentioned, context, kms, e, callId, resolveEvaluate, toEValue, error}) => {\n\n            async function convert(fromUnits, fromAmount, toUnits) {\n              let evalue;\n              if (toUnits.value == fromUnits.value) {\n                evalue = fromAmount\n                // if (!fromAmount.value) {\n                //  debugger\n                //}\n                evalue.evalue = fromAmount.evalue || fromAmount.value\n              } else {\n                const formula = kms.formulas.api.get(toUnits, [fromUnits])\n                if (!formula) {\n                  const reason = { marker: 'reason', focusableForPhrase: true, evalue: { marker: 'noconversion', from: fromUnits, to: toUnits } }\n                  kms.stm.api.mentioned({ context: reason })\n                  error(reason)\n                }\n                kms.stm.api.setVariable(fromUnits.value, fromAmount)\n                evalue = await e(formula)\n              }\n              return evalue\n            }\n\n            if (!context.from.unit) {\n              resolveEvaluate(context.from, await e(context.from))\n            }\n\n\n            const from = toEValue(context.from)\n            mentioned(context.to)\n            const evalueNumerator = await convert(from.unit.numerator, from.amount, context.to.numerator)\n            const evalueDenominator = await convert(from.unit.denominator, 1, context.to.denominator)\n            const evalue = { evalue: (toFinalValue(evalueNumerator) || evalueNumerator.value) / (toFinalValue(evalueDenominator) || evalueDenominator.evalue) }\n            context.evalue = {\n              paraphrase: true,\n              marker: 'quantity',\n              level: 1,\n              unit: context.to,\n              amount: { evalue, paraphrase: undefined }\n            }\n          }"
+          "apply": "async ({remember, context, kms, e, callId, resolveEvaluate, toEValue, error}) => {\n\n            async function convert(fromUnits, fromAmount, toUnits) {\n              let evalue;\n              if (toUnits.value == fromUnits.value) {\n                evalue = fromAmount\n                // if (!fromAmount.value) {\n                //  debugger\n                //}\n                evalue.evalue = fromAmount.evalue || fromAmount.value\n              } else {\n                const formula = kms.formulas.api.get(toUnits, [fromUnits])\n                if (!formula) {\n                  const reason = { marker: 'reason', focusableForPhrase: true, evalue: { marker: 'noconversion', from: fromUnits, to: toUnits } }\n                  kms.stm.api.remember({ context: reason })\n                  error(reason)\n                }\n                kms.stm.api.setVariable(fromUnits.value, fromAmount)\n                evalue = await e(formula)\n              }\n              return evalue\n            }\n\n            if (!context.from.unit) {\n              resolveEvaluate(context.from, await e(context.from))\n            }\n\n\n            const from = toEValue(context.from)\n            remember(context.to)\n            const evalueNumerator = await convert(from.unit.numerator, from.amount, context.to.numerator)\n            const evalueDenominator = await convert(from.unit.denominator, 1, context.to.denominator)\n            const evalue = { evalue: (toFinalValue(evalueNumerator) || evalueNumerator.value) / (toFinalValue(evalueDenominator) || evalueDenominator.evalue) }\n            context.evalue = {\n              paraphrase: true,\n              marker: 'quantity',\n              level: 1,\n              unit: context.to,\n              amount: { evalue, paraphrase: undefined }\n            }\n          }"
         }
       ]
     }

package/common/rates.js

@@ -37,7 +37,7 @@ const template = {
         {
           where: where(),
           match: ({context}) => context.marker == 'convertToUnits' && context.evaluate && (context.from?.unit?.marker == 'unitPerUnit' || context.to.marker == 'unitPerUnit'),
-          apply: async ({mentioned, context, kms, e, callId, resolveEvaluate, toEValue, error}) => {
+          apply: async ({remember, context, kms, e, callId, resolveEvaluate, toEValue, error}) => {
 
             async function convert(fromUnits, fromAmount, toUnits) {
               let evalue;
@@ -51,7 +51,7 @@ const template = {
                 const formula = kms.formulas.api.get(toUnits, [fromUnits])
                 if (!formula) {
                   const reason = { marker: 'reason', focusableForPhrase: true, evalue: { marker: 'noconversion', from: fromUnits, to: toUnits } }
-                  kms.stm.api.mentioned({ context: reason })
+                  kms.stm.api.remember({ context: reason })
                   error(reason)
                 }
                 kms.stm.api.setVariable(fromUnits.value, fromAmount)
@@ -66,7 +66,7 @@ const template = {
 
 
             const from = toEValue(context.from)
-            mentioned(context.to)
+            remember(context.to)
             const evalueNumerator = await convert(from.unit.numerator, from.amount, context.to.numerator)
             const evalueDenominator = await convert(from.unit.denominator, 1, context.to.denominator)
             const evalue = { evalue: (toFinalValue(evalueNumerator) || evalueNumerator.value) / (toFinalValue(evalueDenominator) || evalueDenominator.evalue) }

package/common/reminders.js

@@ -106,7 +106,7 @@ class API {
     const id = ++this._objects.id
     reminder.id = id
     this._objects.reminders.push(reminder)
-    this.args.mentioned({ context: reminder })
+    this.args.remember({ context: reminder })
     this._objects.current = id
   }