ekms 9.6.0-beta.15 → 9.6.0-beta.16

package/common/dimension.instance.json

@@ -63,7 +63,7 @@
       ],
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:198",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:201",
           "id": "preferredUnits",
           "isA": [
             "verb"
@@ -72,7 +72,7 @@
           "semantic": "async ({context, e, api, toArray, resolveResponse}) => {\n        const preferredUnits = api.getPreferredUnits(context.quantity)\n        if (!preferredUnits) {\n          return\n        }\n        const from = context.quantity;\n        const value = await e({ marker: 'convertToUnits', from, to: preferredUnits })\n        resolveResponse(context, value.evalue)\n      }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:213",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:216",
           "id": "useUnits",
           "isA": [
             "verb"
@@ -81,11 +81,11 @@
           "semantic": "({context, api}) => {\n        api.setPreferredUnits(context.units)\n      }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:222",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:225",
           "id": "dimension"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:226",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:229",
           "id": "quantity",
           "isA": [
             "noun"
@@ -106,7 +106,7 @@
           "id": "amount"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:241",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:244",
           "id": "degree",
           "words": [
             {
@@ -126,7 +126,7 @@
           "bridge": "{ marker: next(operator('quantity')), dead: true, unit: after[0], amount: before[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:255",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:258",
           "id": "convertToUnits",
           "bridge": "{ ...next(operator), from: before[0], to: after[0] }",
           "isA": [
@@ -22731,12 +22731,12 @@
       ],
       "generators": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:191"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:194"
         }
       ],
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:198",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:201",
           "id": "preferredUnits",
           "isA": [
             "verb"
@@ -22744,7 +22744,7 @@
           "bridge": "{ ...next(operator), quantity: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'quantity' }] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:213",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:216",
           "id": "useUnits",
           "isA": [
             "verb"
@@ -22752,11 +22752,11 @@
           "bridge": "{ ...next(operator), units: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'units' }] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:222",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:225",
           "id": "dimension"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:226",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:229",
           "id": "quantity",
           "isA": [
             "noun"
@@ -22775,7 +22775,7 @@
           "id": "amount"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:241",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:244",
           "id": "degree",
           "words": [
             {
@@ -22794,7 +22794,7 @@
           "bridge": "{ marker: next(operator('quantity')), dead: true, unit: after[0], amount: before[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:255",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:258",
           "id": "convertToUnits",
           "bridge": "{ ...next(operator), from: before[0], to: after[0] }",
           "isA": [

package/common/dimension.js

@@ -35,26 +35,29 @@ class API {
   initialize({ config, objects }) {
     this._config = config
     this._objects = objects
-    objects.preferredUnits = []
   }
 
   getPreferredUnits(quantity) {
-    for (const unit of this._objects.preferredUnits) {
-      if (quantity.unit.marker == 'unitPerUnit') {
-        if (quantity.unit.numerator.dimension == unit.numerator.dimension &&
-            quantity.unit.denominator.dimension == unit.denominator.dimension) {
-          return unit
+    const preferredUnits = this.args.mentions({
+      context: { marker: 'unit' },
+      condition: (unit) => {
+        if (quantity.unit.marker == 'unitPerUnit') {
+          if (quantity.unit.numerator.dimension == unit.numerator.dimension &&
+              quantity.unit.denominator.dimension == unit.denominator.dimension) {
+            return true
+          }
+        } else if (unit.dimension) {
+          if (unit.dimension == quantity.unit.dimension) {
+            return true
+          }
         }
-      } else if (unit.dimension) {
-        if (unit.dimension == quantity.unit.dimension) {
-          return unit
-        }
-      }
-    }
+      },
+    })
+    return preferredUnits
   }
 
   setPreferredUnits(units) {
-    this._objects.preferredUnits.unshift(units)
+    this.args.mentioned(units)
   }
 
   setMeasurementSystem(measurementSystem) {
@@ -336,8 +339,8 @@ knowledgeModule({
     checks: {
       objects: [
         { km: 'properties' },
+        { km: 'stm' },
         { path: ['measurementSystem'] },
-        { path: ['preferredUnits'] },
       ],
       context: [
         defaultContextCheck({ marker: 'metric_system', exported: true }),

package/common/drone.test.json

@@ -180319,6 +180319,7 @@
             "value": "second",
             "word": "second"
           },
+          "fromSTM": true,
           "interpolate": [
             {
               "context": {
@@ -180359,10 +180360,14 @@
             "value": "inch",
             "word": "inches"
           },
+          "pullFromContext": false,
           "range": {
             "end": 20,
             "start": 4
           },
+          "stm": {
+            "id": 2
+          },
           "text": "inches per second",
           "types": [
             "unitPerUnit"
@@ -180435,6 +180440,7 @@
                   "value": "second",
                   "word": "second"
                 },
+                "fromSTM": true,
                 "interpolate": [
                   {
                     "context": {
@@ -180475,10 +180481,14 @@
                   "value": "inch",
                   "word": "inches"
                 },
+                "pullFromContext": false,
                 "range": {
                   "end": 20,
                   "start": 4
                 },
+                "stm": {
+                  "id": 2
+                },
                 "text": "inches per second",
                 "types": [
                   "unitPerUnit"
@@ -180831,75 +180841,7 @@
           }
         },
         "dimension2": {
-          "km": "dimension2",
-          "preferredUnits": [
-            {
-              "dead": true,
-              "default": true,
-              "denominator": {
-                "dimension": "time",
-                "level": 0,
-                "marker": "second",
-                "number": "one",
-                "range": {
-                  "end": 20,
-                  "start": 15
-                },
-                "text": "second",
-                "value": "second",
-                "word": "second"
-              },
-              "interpolate": [
-                {
-                  "context": {
-                    "number": "many"
-                  },
-                  "property": "numerator"
-                },
-                {
-                  "context": {
-                    "default": true,
-                    "level": 0,
-                    "marker": "unitPerUnit",
-                    "range": {
-                      "end": 13,
-                      "start": 11
-                    },
-                    "text": "per",
-                    "word": "per"
-                  }
-                },
-                {
-                  "property": "denominator"
-                }
-              ],
-              "level": 0,
-              "marker": "unitPerUnit",
-              "numerator": {
-                "dead": true,
-                "dimension": "length",
-                "level": 0,
-                "marker": "inch",
-                "number": "many",
-                "range": {
-                  "end": 9,
-                  "start": 4
-                },
-                "text": "inches",
-                "value": "inch",
-                "word": "inches"
-              },
-              "range": {
-                "end": 20,
-                "start": 4
-              },
-              "text": "inches per second",
-              "types": [
-                "unitPerUnit"
-              ],
-              "word": "per"
-            }
-          ]
+          "km": "dimension2"
         },
         "drone1": {
           "current": {
@@ -188651,7 +188593,7 @@
               "marker": "meter",
               "pullFromContext": false,
               "stm": {
-                "id": 2
+                "id": 3
               },
               "value": {
                 "dead": true,
@@ -188671,6 +188613,77 @@
                 "word": "number"
               }
             },
+            {
+              "dead": true,
+              "default": true,
+              "denominator": {
+                "dimension": "time",
+                "level": 0,
+                "marker": "second",
+                "number": "one",
+                "range": {
+                  "end": 20,
+                  "start": 15
+                },
+                "text": "second",
+                "value": "second",
+                "word": "second"
+              },
+              "fromSTM": true,
+              "interpolate": [
+                {
+                  "context": {
+                    "number": "many"
+                  },
+                  "property": "numerator"
+                },
+                {
+                  "context": {
+                    "default": true,
+                    "level": 0,
+                    "marker": "unitPerUnit",
+                    "range": {
+                      "end": 13,
+                      "start": 11
+                    },
+                    "text": "per",
+                    "word": "per"
+                  }
+                },
+                {
+                  "property": "denominator"
+                }
+              ],
+              "level": 0,
+              "marker": "unitPerUnit",
+              "numerator": {
+                "dead": true,
+                "dimension": "length",
+                "level": 0,
+                "marker": "inch",
+                "number": "many",
+                "range": {
+                  "end": 9,
+                  "start": 4
+                },
+                "text": "inches",
+                "value": "inch",
+                "word": "inches"
+              },
+              "pullFromContext": false,
+              "range": {
+                "end": 20,
+                "start": 4
+              },
+              "stm": {
+                "id": 2
+              },
+              "text": "inches per second",
+              "types": [
+                "unitPerUnit"
+              ],
+              "word": "per"
+            },
             {
               "description": "start",
               "fromSTM": true,
@@ -188774,6 +188787,7 @@
                       "value": "second",
                       "word": "second"
                     },
+                    "fromSTM": true,
                     "interpolate": [
                       {
                         "context": {
@@ -188814,10 +188828,14 @@
                       "value": "inch",
                       "word": "inches"
                     },
+                    "pullFromContext": false,
                     "range": {
                       "end": 20,
                       "start": 4
                     },
+                    "stm": {
+                      "id": 2
+                    },
                     "text": "inches per second",
                     "types": [
                       "unitPerUnit"
@@ -188980,6 +188998,7 @@
                 "value": "second",
                 "word": "second"
               },
+              "fromSTM": true,
               "interpolate": [
                 {
                   "context": {
@@ -189020,10 +189039,14 @@
                 "value": "inch",
                 "word": "inches"
               },
+              "pullFromContext": false,
               "range": {
                 "end": 20,
                 "start": 4
               },
+              "stm": {
+                "id": 2
+              },
               "text": "inches per second",
               "types": [
                 "unitPerUnit"

package/common/length.js

@@ -60,6 +60,7 @@ knowledgeModule({
     checks: {
       objects: [
         { km: 'dimension' },
+        { km: 'stm' },
       ],
       context: [defaultContextCheck()],
     }