ekms 8.0.0-beta.80 → 8.0.0-beta.82

package/common/fastfood.js

@@ -1021,7 +1021,7 @@ knowledgeModule( {
                 { property: 'pieces', filter: ['marker', 'value', 'text' ] },
               ],
               context: [
-                ...defaultContextCheck,
+                ...defaultContextCheck(),
                 // TODO some kind of conditional selector { match: (value) => value.marker == 'count', filter: ['marker', 'value', 'text'] },
                 { property: 'comboNumber', filter: ['marker', 'value', 'text' ] },
               ],

package/common/formulas.instance.json

@@ -884,11 +884,11 @@
             ],
             "ops": [
               [
-                "unknown",
+                "is",
                 0
               ],
               [
-                "is",
+                "unknown",
                 0
               ],
               [

package/common/formulas.js

@@ -205,7 +205,7 @@ knowledgeModule({
     contents: tests,
     checks: {
       objects: ['formulas'],
-      context: defaultContextCheck,
+      context: defaultContextCheck(),
     }
   },
 })

package/common/gdefaults.js

@@ -29,6 +29,21 @@ let config = {
       apply: ({context, gp}) => gp(context.response),
     },
 
+    {
+      where: where(),
+      match: ({context}) => context.generate,
+      apply: async ({context, gs}) => {
+        const existing = context.generate.filter((key) => context[key] !== undefined)
+        const filtered = existing.filter((key) => {
+          if (context[key] && context[key].skipDefault) {
+            return false
+          }
+          return true
+        })
+        return gs(filtered.map((key) => context[key]))
+      }
+    },
+
     {
       where: where(),
       //({context}) => context.paraphrase && context.modifiers,
@@ -208,7 +223,7 @@ knowledgeModule({
     name: './gdefaults.test.json',
     contents: gdefaults_tests,
     checks: {
-            context: defaultContextCheck,
+            context: defaultContextCheck(),
           },
 
   },

package/common/help.js

@@ -67,7 +67,7 @@ const config = {
 
         return help
       },
-      optional: { withKM: "{ marker: 'km', kms: []}" },
+      optional: { 1: "{ marker: 'km', kms: []}" },
       bridge: "{ ...next(operator), kms: after[0].kms, isResponse: true }" 
     },
     { id: "withKM", level: 0, bridge: "{ ...next(operator), kms: after[0] }" },
@@ -103,7 +103,7 @@ knowledgeModule({
     name: './help.test.json',
     contents: help_tests,
     checks: {
-            context: defaultContextCheck,
+            context: defaultContextCheck(),
           },
   },
 })

package/common/helpers.js

@@ -138,27 +138,30 @@ const toEValue = (context) => {
 }
 
 const defaultContextCheckProperties = ['marker', 'text', 'verbatim', 'isResponse', { property: 'response', filter: ['marker', 'text', 'verbatim'] }] 
-const defaultContextCheck = [
-  ...defaultContextCheckProperties,
-  (object) => {
-    if (typeof object.value == 'object') {
-      return { property: 'value', filter: defaultContextCheckProperties }
-    } else {
-      return 'value'
-    }
-  },
-  (object) => {
-    if (!Array.isArray(object.modifiers)) {
-      return
-    }
-    if (typeof object.modifiers[0] == 'object') {
-      return { property: 'modifiers', filter: defaultContextCheckProperties }
-    } else {
-      return 'modifiers'
-    }
-  },
-  { property: 'modifiers', isPropertyList: true, filter: defaultContextCheckProperties }
-]
+const defaultContextCheck = (properties = []) => {
+  return [
+    ...defaultContextCheckProperties,
+    ...properties.map((property) => { return { property, filter: defaultContextCheckProperties } }),
+    (object) => {
+      if (typeof object.value == 'object') {
+        return { property: 'value', filter: defaultContextCheckProperties }
+      } else {
+        return 'value'
+      }
+    },
+    (object) => {
+      if (!Array.isArray(object.modifiers)) {
+        return
+      }
+      if (typeof object.modifiers[0] == 'object') {
+        return { property: 'modifiers', filter: defaultContextCheckProperties }
+      } else {
+        return 'modifiers'
+      }
+    },
+    { property: 'modifiers', isPropertyList: true, filter: defaultContextCheckProperties }
+  ]
+}
 
 module.exports = {
   defaultContextCheck,

package/common/hierarchy.js

@@ -304,7 +304,7 @@ knowledgeModule( {
     checks: {
       objects: ['children', 'concept', 'parents', 'properties'],
       checks: {
-            context: defaultContextCheck,
+            context: defaultContextCheck(),
           },
 
     },

package/common/javascript.js

@@ -73,7 +73,7 @@ knowledgeModule( {
     name: './javascript.test.json',
     contents: javascript_tests,
     checks: {
-            context: defaultContextCheck,
+            context: defaultContextCheck(),
           },
 
   },

package/common/kirk.instance.json

@@ -1435,15 +1435,15 @@
             ],
             "ops": [
               [
-                "self",
+                "is",
                 0
               ],
               [
-                "is",
+                "kirk",
                 0
               ],
               [
-                "kirk",
+                "self",
                 0
               ]
             ],

package/common/kirk.js

@@ -27,7 +27,7 @@ knowledgeModule( {
           name: './kirk.test.json',
           contents: kirk_tests,
           checks: {
-            context: defaultContextCheck,
+            context: defaultContextCheck(),
           },
 
         },