tpmkms 8.0.0-beta.39 → 8.0.0-beta.40

package/common/nameable.js

@@ -21,8 +21,15 @@ class API {
     context.stm.names.push(name)
   }
 
-  get(name) {
-    return this.objects.named[name]
+  get(type, name) {
+    return this.args.kms.stm.api.mentions({ 
+      context: type, 
+      condition: (context) => {
+        if (context.stm && context.stm.names) {
+          return context.stm.names.includes(name)
+        }
+      }
+    })
   }
 
   getNamesByType(type) {
@@ -96,7 +103,7 @@ const configStruct = {
         // TODO find report being referred to
         const nameable = (await e(context.nameable)).evalue
         const name = context.name.text
-        config.addWord(name, { id: nameable.marker, initial: `{ value: "${nameable.marker}", pullFromContext: true, nameable_named: true }` })
+        config.addWord(name, { id: nameable.marker, initial: `{ value: "${name}", pullFromContext: true, nameable_named: true }` })
         api.setName(nameable, name)
       }
     },

package/common/stm.js

@@ -65,18 +65,20 @@ class API {
     this._objects.mentioned.unshift(concept)
   }
 
-  mentions({ context, useHierarchy=true } = {}) {
+  mentions({ context, useHierarchy=true, condition = (() => true) } = {}) {
     const findPrevious = !!context.stm_previous
 
     // care about value first
     let findCounter = 0
     for (let m of this._objects.mentioned) {
       if (context.value && (context.value == m.marker || context.value == m.value)) {
-        if (findPrevious && findCounter < 1) {
-          findCounter += 1
+        findCounter += 1
+        if (findPrevious && findCounter < 2) {
           continue
         }
-        return m
+        if (condition()) {
+          return m
+        }
       }
     }
 
@@ -88,21 +90,25 @@ class API {
     findCounter = 0
     for (let m of this._objects.mentioned) {
       if (context.marker != 'unknown' && this.isA(m.marker, context.marker)) {
-        if (findPrevious && findCounter < 1) {
-          findCounter += 1
+        findCounter += 1
+        if (findPrevious && findCounter < 2) {
           continue
         }
-        return m
+        if (condition(m)) {
+          return m
+        }
       }
       // if (context.types && context.types.includes(m.marker)) {
       if (context.types) {
         for (let parent of context.types) {
           if (parent != 'unknown' && this.isA(m.marker, parent)) {
-            if (findPrevious && findCounter < 1) {
-              findCounter += 1
+            findCounter += 1
+            if (findPrevious && findCounter < 2) {
               continue
             }
-            return m
+            if (condition(m)) {
+              return m
+            }
           }
         }
       }
@@ -112,11 +118,13 @@ class API {
     if (context.types && context.types.length == 1) {
       for (let m of this._objects.mentioned) {
         if (context.unknown) {
-          if (findPrevious && findCounter < 1) {
-            findCounter += 1
+          findCounter += 1
+          if (findPrevious && findCounter < 2) {
             continue
           }
-          return m
+          if (condition(m)) {
+            return m
+          }
         }
       }
     }

package/package.json

@@ -291,8 +291,8 @@
     "table": "^6.7.1",
     "base-64": "^1.0.0",
     "argparse": "^2.0.1",
-    "theprogrammablemind": "8.0.0-beta.39"
+    "theprogrammablemind": "8.0.0-beta.40"
   },
-  "version": "8.0.0-beta.39",
+  "version": "8.0.0-beta.40",
   "license": "UNLICENSED"
 }