ekms 9.6.1 → 9.6.2

package/common/colors.instance.json

@@ -3661,20 +3661,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -37667,20 +37653,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "is",

package/common/compass.instance.json

@@ -342,6 +342,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -2577,6 +2582,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -6170,6 +6180,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",

package/common/dates.instance.json

@@ -3441,20 +3441,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -11890,20 +11876,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -16118,20 +16090,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -19243,48 +19201,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "setIdSuffix",

package/common/dialogues.js

@@ -1,4 +1,4 @@
-const { knowledgeModule, where, stableId } = require('./runtime').theprogrammablemind
+const { debug, knowledgeModule, where, stableId } = require('./runtime').theprogrammablemind
 const meta = require('./meta.js')
 const gdefaults = require('./gdefaults.js')
 const sdefaults = require('./sdefaults.js')

package/common/dimension.instance.json

@@ -24,6 +24,7 @@
         "((amount/* || number/*) [amountOfCoordinate|] ([unit]))",
         "(([amount]) [unit])",
         "((@<=quantity || context.possession == true) [convertToUnits|in] (unit))",
+        "([forQuantity|for] (@<= quantity && !context.unit.dimension == null))",
         "([useUnits|use] (unit))",
         "([preferredUnits] (quantity))",
         {
@@ -63,16 +64,38 @@
       ],
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:192",
+          "id": "forQuantity",
+          "isA": [
+            "preposition"
+          ],
+          "bridge": "{ ...operator, quantity: after[0], operator: operator, interpolate: [ { property: 'operator' }, { property: 'quantity' } ] }",
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "quantity"
+          ]
+        },
+        {
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:199",
           "id": "preferredUnits",
           "isA": [
             "verb"
           ],
           "bridge": "{ ...next(operator), quantity: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'quantity' }] }",
-          "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      }"
+          "semantic": "async ({context, e, api, toArray, resolveResponse}) => {\n        const preferredUnits = await 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:207",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:214",
           "id": "useUnits",
           "isA": [
             "verb"
@@ -81,15 +104,31 @@
           "semantic": "({context, api}) => {\n        api.setPreferredUnits(context.units)\n      }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:216",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:223",
           "id": "dimension"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:220",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:227",
           "id": "quantity",
           "isA": [
             "noun"
           ],
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "amount",
+            "unit"
+          ],
           "generatorp": "[object Object]",
           "generatorr": "[object Object]"
         },
@@ -104,10 +143,13 @@
         {
           "id": "amountOfCoordinate",
           "convolution": true,
+          "before": [
+            "preposition"
+          ],
           "bridge": "{ marker: next(operator('quantity')), dead: true, unit: after[0], amount: before[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:248",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:257",
           "id": "convertToUnits",
           "bridge": "{ ...next(operator), from: before[0], to: after[0] }",
           "isA": [
@@ -25446,6 +25488,7 @@
         "((amount/* || number/*) [amountOfCoordinate|] ([unit]))",
         "(([amount]) [unit])",
         "((@<=quantity || context.possession == true) [convertToUnits|in] (unit))",
+        "([forQuantity|for] (@<= quantity && !context.unit.dimension == null))",
         "([useUnits|use] (unit))",
         "([preferredUnits] (quantity))",
         {
@@ -25479,12 +25522,34 @@
       ],
       "generators": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:185"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:186"
         }
       ],
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:192",
+          "id": "forQuantity",
+          "isA": [
+            "preposition"
+          ],
+          "bridge": "{ ...operator, quantity: after[0], operator: operator, interpolate: [ { property: 'operator' }, { property: 'quantity' } ] }",
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "quantity"
+          ]
+        },
+        {
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:199",
           "id": "preferredUnits",
           "isA": [
             "verb"
@@ -25492,7 +25557,7 @@
           "bridge": "{ ...next(operator), quantity: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'quantity' }] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:207",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:214",
           "id": "useUnits",
           "isA": [
             "verb"
@@ -25500,15 +25565,31 @@
           "bridge": "{ ...next(operator), units: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'units' }] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:216",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:223",
           "id": "dimension"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:220",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:227",
           "id": "quantity",
           "isA": [
             "noun"
           ],
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "amount",
+            "unit"
+          ],
           "generatorp": {
             "level": 1
           },
@@ -25527,10 +25608,13 @@
         {
           "id": "amountOfCoordinate",
           "convolution": true,
+          "before": [
+            "preposition"
+          ],
           "bridge": "{ marker: next(operator('quantity')), dead: true, unit: after[0], amount: before[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:248",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:257",
           "id": "convertToUnits",
           "bridge": "{ ...next(operator), from: before[0], to: after[0] }",
           "isA": [

package/common/dimension.js

@@ -37,8 +37,8 @@ class API {
     this._objects = objects
   }
 
-  getPreferredUnits(quantity) {
-    const preferredUnits = this.args.mentions({
+  async getPreferredUnits(quantity) {
+    const preferredUnits = await this.args.mentions({
       context: { marker: 'unit' },
       condition: (unit) => {
         if (quantity.unit.marker == 'unitPerUnit') {
@@ -168,6 +168,7 @@ const config = {
     "((amount/* || number/*) [amountOfCoordinate|] ([unit]))",
     "(([amount]) [unit])",
     "((@<=quantity || context.possession == true) [convertToUnits|in] (unit))",
+    "([forQuantity|for] (@<= quantity && !context.unit.dimension == null))",
 
     "([useUnits|use] (unit))",
     "([preferredUnits] (quantity))",
@@ -188,13 +189,19 @@ const config = {
     },
   ],
   bridges: [
+    {
+      id: 'forQuantity',
+      isA: ['preposition'],
+      bridge: "{ ...operator, quantity: after[0], operator: operator, interpolate: [ { property: 'operator' }, { property: 'quantity' } ] }",
+      check: defaultContextCheckProperties(['quantity']),
+    },
     { 
       where: where(),
       id: "preferredUnits",
       isA: ['verb'],
       bridge: "{ ...next(operator), quantity: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'quantity' }] }",
       semantic: async ({context, e, api, toArray, resolveResponse}) => {
-        const preferredUnits = api.getPreferredUnits(context.quantity)
+        const preferredUnits = await api.getPreferredUnits(context.quantity)
         if (!preferredUnits) {
           return
         }
@@ -220,6 +227,7 @@ const config = {
       where: where(),
       id: "quantity", 
       isA: ['noun'],
+      check: defaultContextCheckProperties(['amount', 'unit']),
       // bridge: "{ ...next(operator) }",
       generatorp: {
         level: 1, 
@@ -241,6 +249,7 @@ const config = {
     { 
       id: "amountOfCoordinate", 
       convolution: true, 
+      before: ['preposition'],
       // bridge: "{ marker: next(operator('quantity')), dead: true, unit: after[0], value: before[0].value, amount: before[0] }" 
       bridge: "{ marker: next(operator('quantity')), dead: true, unit: after[0], amount: before[0] }" 
     },