ekms 8.0.0-beta.81 → 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.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.js

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

package/common/length.instance.json

@@ -2166,7 +2166,7 @@
             ],
             "ops": [
               [
-                "is",
+                "isEd",
                 0
               ],
               [
@@ -2211,7 +2211,7 @@
             ],
             "ops": [
               [
-                "is",
+                "isEd",
                 0
               ],
               [
@@ -2252,7 +2252,7 @@
             ],
             "ops": [
               [
-                "is",
+                "isEd",
                 0
               ],
               [
@@ -2289,7 +2289,7 @@
             ],
             "ops": [
               [
-                "is",
+                "isEd",
                 0
               ],
               [
@@ -2322,7 +2322,7 @@
             ],
             "ops": [
               [
-                "is",
+                "isEd",
                 0
               ],
               [
@@ -2351,7 +2351,7 @@
             ],
             "ops": [
               [
-                "is",
+                "isEd",
                 0
               ],
               [
@@ -2691,19 +2691,11 @@
           ],
           [
             "list",
-            0
+            1
           ],
           [
             "propertyOf",
             0
-          ],
-          [
-            "unit",
-            0
-          ],
-          [
-            "unknown",
-            0
           ]
         ],
         [
@@ -2717,7 +2709,7 @@
           ],
           [
             "list",
-            0
+            1
           ],
           [
             "propertyOf",
@@ -2726,14 +2718,6 @@
           [
             "unit",
             0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
           ]
         ],
         [
@@ -2747,7 +2731,7 @@
           ],
           [
             "list",
-            0
+            1
           ],
           [
             "propertyOf",
@@ -2768,7 +2752,13 @@
             0
           ],
           [
-            "length",
+            "list",
+            1
+          ]
+        ],
+        [
+          [
+            "is",
             0
           ],
           [
@@ -2785,13 +2775,23 @@
             "is",
             0
           ],
+          [
+            "list",
+            1
+          ],
+          [
+            "propertyOf",
+            1
+          ]
+        ],
+        [
           [
             "length",
             0
           ],
           [
             "list",
-            1
+            0
           ],
           [
             "propertyOf",
@@ -2800,20 +2800,20 @@
           [
             "unit",
             0
+          ],
+          [
+            "unknown",
+            0
           ]
         ],
         [
-          [
-            "is",
-            0
-          ],
           [
             "length",
             0
           ],
           [
             "list",
-            1
+            0
           ],
           [
             "propertyOf",
@@ -2825,36 +2825,38 @@
           ],
           [
             "unknown",
-            1
-          ]
-        ],
-        [
-          [
-            "is",
             0
           ],
           [
-            "list",
+            "unknown",
             1
           ]
         ],
         [
           [
-            "is",
+            "length",
             0
           ],
           [
             "list",
-            1
+            0
           ],
           [
             "propertyOf",
             0
+          ],
+          [
+            "unit",
+            0
+          ],
+          [
+            "unknown",
+            1
           ]
         ],
         [
           [
-            "is",
+            "length",
             0
           ],
           [
@@ -2863,6 +2865,14 @@
           ],
           [
             "propertyOf",
+            0
+          ],
+          [
+            "unit",
+            0
+          ],
+          [
+            "unknown",
             1
           ]
         ]
@@ -22144,19 +22154,11 @@
       ],
       [
         "list",
-        0
+        1
       ],
       [
         "propertyOf",
         0
-      ],
-      [
-        "unit",
-        0
-      ],
-      [
-        "unknown",
-        0
       ]
     ],
     [
@@ -22170,7 +22172,7 @@
       ],
       [
         "list",
-        0
+        1
       ],
       [
         "propertyOf",
@@ -22179,14 +22181,6 @@
       [
         "unit",
         0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
       ]
     ],
     [
@@ -22200,7 +22194,7 @@
       ],
       [
         "list",
-        0
+        1
       ],
       [
         "propertyOf",
@@ -22221,7 +22215,13 @@
         0
       ],
       [
-        "length",
+        "list",
+        1
+      ]
+    ],
+    [
+      [
+        "is",
         0
       ],
       [
@@ -22238,13 +22238,23 @@
         "is",
         0
       ],
+      [
+        "list",
+        1
+      ],
+      [
+        "propertyOf",
+        1
+      ]
+    ],
+    [
       [
         "length",
         0
       ],
       [
         "list",
-        1
+        0
       ],
       [
         "propertyOf",
@@ -22253,20 +22263,20 @@
       [
         "unit",
         0
+      ],
+      [
+        "unknown",
+        0
       ]
     ],
     [
-      [
-        "is",
-        0
-      ],
       [
         "length",
         0
       ],
       [
         "list",
-        1
+        0
       ],
       [
         "propertyOf",
@@ -22278,36 +22288,38 @@
       ],
       [
         "unknown",
-        1
-      ]
-    ],
-    [
-      [
-        "is",
         0
       ],
       [
-        "list",
+        "unknown",
         1
       ]
     ],
     [
       [
-        "is",
+        "length",
         0
       ],
       [
         "list",
-        1
+        0
       ],
       [
         "propertyOf",
         0
+      ],
+      [
+        "unit",
+        0
+      ],
+      [
+        "unknown",
+        1
       ]
     ],
     [
       [
-        "is",
+        "length",
         0
       ],
       [
@@ -22316,6 +22328,14 @@
       ],
       [
         "propertyOf",
+        0
+      ],
+      [
+        "unit",
+        0
+      ],
+      [
+        "unknown",
         1
       ]
     ]

package/common/length.js

@@ -46,7 +46,7 @@ knowledgeModule({
     name: './length.test.json',
     contents: length_tests,
     checks: {
-            context: defaultContextCheck,
+            context: defaultContextCheck(),
           },
 
   },

package/common/listener.js

@@ -41,7 +41,7 @@ knowledgeModule( {
     name: './listener.test.json',
     contents: listener_tests,
     checks: {
-            context: defaultContextCheck,
+            context: defaultContextCheck(),
             objects: ['mentioned', { km: 'gdefaults' }],
           },
   },

package/common/math.js

@@ -124,7 +124,7 @@ knowledgeModule( {
     name: './math.test.json',
     contents: tests,
     checks: {
-            context: defaultContextCheck,
+            context: defaultContextCheck(),
           },
 
   },

package/common/meta.js

@@ -384,7 +384,7 @@ knowledgeModule({
       words: true,
     },
     checks: {
-            context: defaultContextCheck,
+            context: defaultContextCheck(),
           },
 
   },

package/common/nameable.js

@@ -134,7 +134,7 @@ knowledgeModule( {
     name: './nameable.test.json',
     contents: nameable_tests,
     checks: {
-            context: [...defaultContextCheck, 'pullFromContext'],
+            context: [...defaultContextCheck(), 'pullFromContext'],
             objects: ['mentioned', { km: 'stm' }],
           },
     include: {

package/common/negation.js

@@ -31,7 +31,7 @@ knowledgeModule( {
     name: './negation.test.json',
     contents: negation_tests,
     checks: {
-      context: defaultContextCheck,
+      context: defaultContextCheck(),
     },
   },
 })

package/common/numbers.js

@@ -93,7 +93,7 @@ knowledgeModule( {
     name: './numbers.test.json',
     contents: numbers_tests,
     checks: {
-            context: defaultContextCheck,
+            context: defaultContextCheck(),
           },
 
   },

package/common/ordering.js

@@ -121,7 +121,7 @@ knowledgeModule( {
             heck: ['children', 'concept', 'parents', 'properties'],
             contents: ordering_tests,
             checks: {
-              context: defaultContextCheck,
+              context: defaultContextCheck(),
             },
 
           },

package/common/ordinals.js

@@ -53,7 +53,7 @@ knowledgeModule( {
     name: './ordinals.test.json',
     contents: ordinals_tests,
     checks: {
-            context: defaultContextCheck,
+            context: defaultContextCheck(),
           },
 
   },