ekms 9.6.0-beta.16 → 9.6.0-beta.17

package/common/conjunction.js

@@ -1,7 +1,7 @@
 const { knowledgeModule, where } = require('./runtime').theprogrammablemind
-const gdefaults = require('./gdefaults.js')
+const stm = require('./stm.js')
 const conjunction_tests = require('./conjunction.test.json')
-const { defaultObjectCheck, defaultContextCheck, propertyToArray } = require('./helpers')
+const { toFinalValue, defaultObjectCheck, defaultContextCheck, propertyToArray } = require('./helpers')
 const { isA, asList, listable } = require('./helpers/conjunction.js')
 
 const config = {
@@ -40,6 +40,20 @@ const config = {
       bridge: "{ ...operator, value: append(before, operator.value) }"
     },
   ],
+  semantics: [
+    {
+      where: where(),
+      notes: 'evaluate elements of the list individually',
+      match: ({context, callId}) => context.marker == 'list' && context.evaluate,
+      apply: async ({context, toArray, toList, e, resolveEvaluate}) => {
+        const list = []
+        for (const element of toArray(context)) {
+          list.push(await e(element))
+        }
+        resolveEvaluate(context, toList(list))
+      }
+    },
+  ],
   generators: [
     {
       where: where(),
@@ -67,9 +81,9 @@ const config = {
       match: ({context, hierarchy}) => context.marker == 'list' && context.value,
       apply: async ({context, gs}) => {
         if (context.newLinesOnly) {
-          return await gs(context.value, '\n')
+          return await gs(toFinalValue(context), '\n')
         } else {
-          return await gs(context.value, ', ', ' and ')
+          return await gs(toFinalValue(context), ', ', ' and ')
         }
       }
     },
@@ -108,7 +122,7 @@ function initializer({objects, config, isModule}) {
 
 knowledgeModule( { 
   config,
-  includes: [gdefaults],
+  includes: [stm],
   initializer,
 
   module,

package/common/crew.instance.json

@@ -30402,6 +30402,7 @@
             "modifiers": [
               "determiner"
             ],
+            "propertyOf": true,
             "object": {
               "value": "phasers",
               "unknown": true,
@@ -30552,6 +30553,24 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "propertyOf",
+            0
+          ],
+          [
+            "the",
+            0
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -34676,6 +34695,7 @@
             "modifiers": [
               "determiner"
             ],
+            "propertyOf": true,
             "object": {
               "value": "photon_torpedo",
               "number": "many",
@@ -46938,6 +46958,7 @@
               "modifiers": [
                 "determiner"
               ],
+              "propertyOf": true,
               "object": {
                 "value": "weapon",
                 "unknown": true,
@@ -50507,6 +50528,7 @@
               "modifiers": [
                 "determiner"
               ],
+              "propertyOf": true,
               "object": {
                 "value": "weapon",
                 "unknown": true,
@@ -53284,6 +53306,24 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "propertyOf",
+        0
+      ],
+      [
+        "the",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "is",

package/common/dialogues.js

@@ -476,7 +476,12 @@ const config = {
         }
         // greg101
         if (focus == 'one') {
-          return `${await g(context.two)} ${isMany(context.one) || isMany(context.two) || isMany(context) ? "are" : "is"} ${await gp(context.one)}`
+          let number = 'one'
+          if (context.two.evalue && isMany(context.two.evalue)) {
+            number = 'many'
+          }
+          return `${await g(context.two)} ${number == 'many' ? "are" : "is"} ${await gp({ ...context.one, number })}`
+          // return `${await g(context.two)} ${isMany(context.one) || isMany(context.two) || isMany(context) ? "are" : "is"} ${await gp(context.one)}`
         } else {
           // TODO fix this using the assumed and that whole mess. change isResponse to useValue
           if (context.isResponse) {