ekms 8.1.0 → 8.3.0-beta.0

package/common/gdefaults.js

@@ -33,17 +33,29 @@ let config = {
       where: where(),
       match: ({context}) => context.generate,
       apply: async ({context, gs}) => {
-        const existing = context.generate.filter((key) => context[key] !== undefined)
+        const existing = context.generate.filter((key) => context[key] !== undefined || key == 'this')
         const filtered = existing.filter((key) => {
           if (context[key] && context[key].skipDefault) {
             return false
           }
           return true
         })
-        return gs(filtered.map((key) => context[key]))
+        return gs(filtered.map((key) => {
+          if (key == 'this') {
+            return {...context, generate: null}
+          } else {
+            return context[key]
+          }
+        }))
       }
     },
 
+    {
+      where: where(),
+      match: ({context}) => context.evalue,
+      apply: async ({context, g}) => await g(context.evalue)
+    },
+
     {
       where: where(),
       //({context}) => context.paraphrase && context.modifiers,
@@ -152,12 +164,6 @@ let config = {
       apply: ({context}) => context.verbatim
     },
 
-    {
-      where: where(),
-      match: ({context}) => context.evalue,
-      apply: async ({context, g}) => await g(context.evalue)
-    },
-
     {
       where: where(),
       match: ({context}) => context.value && Array.isArray(context.value),

package/common/helpers/concept.js

@@ -70,7 +70,7 @@ class API {
       config.addOperator({ pattern: `([${objectId}|])`, allowDups: true })
     }
 
-    if (object.unknown) {
+    if (object.unknown || object.marker !== objectId) {
       config.addWord(objectSingular, { id: objectId, initial: `{ value: '${objectId}', number: 'one' }`})
       config.addWord(objectPlural, { id: objectId, initial: `{ value: '${objectId}', number: 'many' }`})
     }
@@ -79,9 +79,13 @@ class API {
       // config.addWord(modifier, { id: modifierId, initial: `{ value: '${modifierId}' }`})
       // TODO call evaluator to pick up overrides
       if (modifier.unknown) {
-        const modifierWord = modifier.text
-        config.addWord(pluralize.singular(modifierWord), { id: modifierId, initial: `{ value: '${modifierId}', number: 'one' }`})
-        config.addWord(pluralize.plural(modifierWord), { id: modifierId, initial: `{ value: '${modifierId}', number: 'many' }`})
+        const modifierWord = modifier.word
+        if (pluralize.isSingular(modifierWord)) {
+          config.addWord(pluralize.singular(modifierWord), { id: modifierId, initial: `{ value: '${modifierId}', number: 'one' }`})
+        }
+        if (pluralize.isPlural(modifierWord)) {
+          config.addWord(pluralize.plural(modifierWord), { id: modifierId, initial: `{ value: '${modifierId}', number: 'many' }`})
+        }
       }
     })
     // modifierds.forEach((modifierId) => config.addWord(modifierId, { id: modifierId, initial: `{ value: '${modifierId}' }`}))

package/common/helpers/properties.js

@@ -104,6 +104,7 @@ class API {
              localHierarchy,
              bridge: `{ 
                ...before, 
+               marker: '${after[0].tag}',
                constraints: [ 
                     { 
                        property: '${after[0].tag}', 
@@ -329,14 +330,25 @@ class API {
     } else {
       config.addOperator({ pattern: `(${beforeOperators} [${operator}|] ${afterOperators})`, allowDups: true })
     }
- 
-    for (let argument of before.concat(after)) {
-      if (create.includes(argument.id)) {
-        // config.addHierarchy('unknown', argument.id)
-        // config.addHierarchy('what', argument.id)
-        // greg23 <<<<<<<<<<<< doing this
-        config.addHierarchy(argument.id, 'unknown')
-        config.addHierarchy(argument.id, 'what')
+
+    if (false) {
+      for (let argument of before.concat(after)) {
+        if (create.includes(argument.id)) {
+          // config.addHierarchy('unknown', argument.id)
+          // config.addHierarchy('what', argument.id)
+          // greg23 <<<<<<<<<<<< doing this
+          config.addHierarchy(argument.id, 'unknown')
+          config.addHierarchy(argument.id, 'what')
+        }
+      } 
+    } else {
+      for (let argument of before.concat(after)) {
+        if (create.includes(argument.id)) {
+          // config.addHierarchy(argument.id, 'unknown')
+          // config.addHierarchy(argument.id, 'what')
+          localHierarchy.push([argument.id, 'unknown'])
+          localHierarchy.push([argument.id, 'what'])
+        }
       }
     }
 

package/common/hierarchy.js

@@ -52,6 +52,7 @@ let config = {
     ['have', 'canBeDoQuestion'],
   ],
   priorities: [
+    { "context": [['isEd', 0], ['is', 0], ], "choose": [1] },
     { "context": [['a', 0], ['questionMark', 0], ['is', 0], ], "choose": [0] },
     // [['is', 0], ['hierarchyAble', 0]],
     // [['a', 0], ['is', 0], ['hierarchyAble', 0]],

package/common/kirk.instance.json

@@ -1237,7 +1237,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -1352,12 +1352,7 @@
         ],
         [
           "weapon",
-          "unknown",
-          false
-        ],
-        [
           "weapon",
-          "what",
           false
         ],
         [