tpmkms_4wp 8.9.1-beta.3 → 8.9.1-beta.30

package/common/helpers/properties.js

@@ -45,10 +45,6 @@ class API {
     }
 
     if (km('concept')) {
-      if (!km('concept').api) {
-        debugger
-        debugger
-      }
       km('concept').api.addDefaultTypesForObjectHierarchy([
         'theAble',
         'queryable',
@@ -119,20 +115,7 @@ class API {
                           } 
                     }
                ] }`,
-             // bridge: `{ ...before, constraints: [ { property: '${after[0].tag}', constraint: { ...next(operator), constrained: true, ${before[0].tag}: after[0].object, ${after[0].tag}: before[0] } } ] }`,
              deferred: `{ ...next(operator), 'isEd': true, subject: 'ownee', '${after[0].tag}': { operator: operator, number: operator.number, ...before[0] }, ${before[0].tag}: after[0].object }` })
-    // config.addBridge({ id: "by", level: 0, bridge: "{ ...next(operator), object: after[0] }", allowDups: true})
-    /*
-    config.addBridge({
-         id: "by",
-         level: 0,
-         bridge: "{ ...next(operator), object: after[0] }",
-         allowDups: true,
-         optional: {
-           [before[0].tag]: "{ marker: 'unknown', implicit: true, concept: true }",
-         },
-       })
-    */
     // TODO have a prepositions category and underPrep category
     config.addHierarchy(edAble.operator, 'isEdAble')
     config.addHierarchy(before[0].id, 'isEder')
@@ -147,7 +130,7 @@ class API {
         const value = constraint.constraint;
         let property = constraint.property;
         const properties = constraint.properties;
-        for (let p of properties) {
+        for (const p of properties) {
           if (value[p].concept) {
             property = p
             constraint.property = p; // set what is used
@@ -157,7 +140,7 @@ class API {
         // value.greg = true
         // value.ownee.query = true
         value.query = true
-        let instance = await e(value)
+        const instance = await e(value)
         if (instance.verbatim) {
           context.evalue = { verbatim: instance.verbatim }
           return
@@ -215,19 +198,6 @@ class API {
         return `${await g(context[after[0].tag])} ${chosen} ${edAble.word} by ${await g(context[before[0].tag])}`
       }
     })
-    /*
-    config.addAssociations([
-      [['isEd', 0], ['unknown', 0], ['isEdAble', 0], ['by', 0]],
-      [['isEd', 0], ['unknown', 1], ['isEdAble', 0], ['by', 0]],
-      [['isEd', 0], ['what', 0], ['isEdAble', 0], ['by', 0]],
-    ])
-    */
-    //config.addAssociations({ 
-      //negative: [[['is', 0], [edAble.operator, 0]]],
-      // positive: [[['isEd', 0], [edAble.operator, 0]]],
-    //})
-    // config.addBridge({ id: "ownee", level: 0, bridge: "{ ...next(operator) }"})
-    // config.addBridge({ id: "owner", level: 0, bridge: "{ ...next(operator) }"})
 
     {
       const whoIsWhatVerbedBy = `${before[0].tag}var is ${after[0].tag}var ${edAble.word} by`
@@ -333,7 +303,7 @@ class API {
     }
 
     if (false) {
-      for (let argument of before.concat(after)) {
+      for (const argument of before.concat(after)) {
         if (create.includes(argument.id)) {
           // config.addHierarchy('unknown', argument.id)
           // config.addHierarchy('what', argument.id)
@@ -343,7 +313,7 @@ class API {
         }
       } 
     } else {
-      for (let argument of before.concat(after)) {
+      for (const argument of before.concat(after)) {
         if (create.includes(argument.id)) {
           // config.addHierarchy(argument.id, 'unknown')
           // config.addHierarchy(argument.id, 'what')
@@ -356,9 +326,9 @@ class API {
     create.map( (id) => {
       if (id === operator) {
         const tagsToProps = (where, args, suffix='') => {
-          let i = 0;
+          const i = 0;
           let r = ''
-          for (let arg of args) {
+          for (const arg of args) {
             r += `, ${arg.tag}${suffix}: ${where}[${i}] `
           }
           return r
@@ -388,7 +358,7 @@ class API {
           // config.addWord(operator, { id: operator, initial: `{ value: "${operator}" }` })
         }
       } else {
-        config.addBridge({ id: id, level: 0, bridge: "{ ...next(operator) }", allowDups: true })
+        config.addBridge({ id: id, allowDups: true })
       }
     })
 
@@ -404,7 +374,7 @@ class API {
     }
 
     config.addPriority({ "context": [[operator, 0], ['means', 0], ], "choose": [0] })
-    config.addPriority({ "context": [['articlePOS', 0], [operator, 0], ], "choose": [0] })
+    config.addPriority({ "context": [['article', 0], [operator, 0], ], "choose": [0] })
 
     config.addGenerator({
       notes: 'ordering generator for paraphrase',
@@ -528,11 +498,11 @@ class API {
         apply: ({context, km, hierarchy, config}) => {
           const api = km('properties').api
           // add types for arguments
-          for (let argument of context.focusable || []) {
+          for (const argument of context.focusable || []) {
             const value = api.toValue(context[argument])
             if (value) {
               const minimas = hierarchy.minima(context[argument].types)
-              for (let type of minimas) {
+              for (const type of minimas) {
                 if (config.exists(value)) {
                   config.addHierarchy(value, type);
                 }
@@ -586,7 +556,7 @@ class API {
     if (!Array.isArray(relations)) {
       relations = [relations]
     }
-    for (let relation of relations) {
+    for (const relation of relations) {
       this._objects.relations.push(relation)
     }
   }
@@ -622,7 +592,7 @@ class API {
       return t.value && v.value && t.value == v.value
     }
 
-    for (let arg of args) {
+    for (const arg of args) {
       if (!matches(template[arg], value[arg])) {
         return null
       }
@@ -632,7 +602,7 @@ class API {
 
   relation_get(context, args) {
     const andTheAnswerIs = []
-    for (let relation of this._objects.relations) {
+    for (const relation of this._objects.relations) {
       if (this.relation_match(args, context, relation)) {
         const queriedArgs = args.filter( (arg) => context[arg].query )
         if (queriedArgs.length == 1) {
@@ -718,7 +688,7 @@ class API {
     if (property == 'property') {
       const objectProps = await this.propertiesFH.getValue([object])
       const values = []
-      for (let key of Object.keys(objectProps)) {
+      for (const key of Object.keys(objectProps)) {
         if (objectProps[key].has) {
           values.push(`${await g(key)}: ${await g({ ...objectProps[key].value, paraphrase: true })}`)
         }
@@ -784,7 +754,7 @@ class API {
         return true
       }
       const parents = this._objects.parents[next] || [];
-      for (let parent of parents) {
+      for (const parent of parents) {
         if (!seen.includes(parent)) {
           todo.push(parent)
           seen.push(parent)
@@ -812,7 +782,7 @@ class API {
         return true
       }
       const parents = this._objects.parents[next] || [];
-      for (let parent of parents) {
+      for (const parent of parents) {
         if (!seen.includes(parent)) {
           todo.push(parent)
           seen.push(parent)
@@ -859,7 +829,7 @@ class API {
         return true
       }
       const parents = this._objects.parents[next] || [];
-      for (let parent of parents) {
+      for (const parent of parents) {
         if (!seen.includes(parent)) {
           todo.push(parent)
           seen.push(parent)
@@ -903,7 +873,7 @@ class API {
   }
 
   isOperator(id) {
-    for (let bridge of this.__config.getBridges()) {
+    for (const bridge of this.__config.getBridges()) {
       if (bridge.id == id) {
         return true
       }

package/common/helpers.js

@@ -83,7 +83,7 @@ const zip = (...arrays) => {
   }
   const zipped = []
   for(let i = 0; i < arrays[0].length; i++){
-    let tuple = []
+    const tuple = []
     for (const array of arrays) {
       tuple.push(array[i])
     }

package/common/hierarchy.js

@@ -32,7 +32,7 @@ const getTypes = ( km, concept, instance ) => {
 
 // TODO the types of rank are x y z ....
 // TODO x is a kind of y
-let config = {
+const config = {
   name: 'hierarchy',
   operators: [
     // "([hierarchyAble|])",
@@ -51,6 +51,15 @@ let config = {
     ['have', 'canBeQuestion'],
     ['have', 'canBeDoQuestion'],
   ],
+  associations: {
+    negative: [],
+    positive: [
+      { context: [["what",0],["is",0],["the",0],["type",1]], choose: 1 },
+      { context: [["what",0],["is",0],["the",0],["type",0],["propertyOf",0],["object",0]], choose: 1 },
+      { context: [["what",0],["is",0],["the",0],["type",1],["propertyOf",0],["object",0]], choose: 1 },
+      { context: [["what",0],["is",0],["the",0],["type",1],["propertyOf",0],["object",1]], choose: 1 },
+    ]
+  },
   priorities: [
     { "context": [['isEd', 0], ['is', 0], ], "choose": [1] },
     { "context": [['a', 0], ['questionMark', 0], ['is', 0], ], "choose": [0] },
@@ -250,8 +259,8 @@ let config = {
         const api = km('properties').api
         const oneConcepts = asList(context);
         const twoConcepts = asList(context.same);
-        for (let oneConcept of oneConcepts.value) {
-          for (let twoConcept of twoConcepts.value) {
+        for (const oneConcept of oneConcepts.value) {
+          for (const twoConcept of twoConcepts.value) {
             oneConceptId = api.makeObject({config, context: oneConcept})
             twoConceptId = api.makeObject({config, context: twoConcept})
             api.rememberIsA(oneConceptId, twoConceptId)