ekms 9.7.1-beta.11 → 9.7.1-beta.13

package/common/crew.js

@@ -13,10 +13,10 @@ const template = {
       "kirk's rank is captain",
       ({config}) => {
         config.updateBridge('rank', ({ bridge }) => {
-          if (!bridge.init) {
-            bridge.init = {}
+          if (!bridge.initial) {
+            bridge.initial = {}
           }
-          bridge.init['typeIsSingular'] = true
+          bridge.initial['typeIsSingular'] = true
         })
       },
       "kirk's eyes are blue",

package/common/dialogues.js

@@ -93,7 +93,7 @@ const config = {
         ...after[0], 
         verb: after[0], 
         that: operator, 
-        generate: ['that', 'verb'], 
+        interpolate: [ { property: 'that' }, { property: 'verb' }], 
         localPriorities: { actLike: ["subordinatedVerb", 0] }, 
         bridge_override: { 
           operator: after[0].marker, 
@@ -101,7 +101,7 @@ const config = {
             ...bridge.subject, 
             postModifiers: ["conditions"], 
             modifiers: [], 
-            generate: concatm("thatClause.", bridge.generate), 
+            interpolate: map(bridge.interpolate, { inside: "thatClause", value: element }), 
             thatClause: bridge, 
             conditions: append(bridge.subject.conditions, [bridge]) 
           }' 
@@ -211,7 +211,7 @@ const config = {
     { 
       id: "isQuery",
       localHierarchy: [['unknown', 'queryable']],  
-      bridge: "{ ...operator, marker: operator('is', 1), one: after[0], two: after[1], query: true, generate: [operator, 'one', 'two'] }" ,
+      bridge: "{ ...operator, marker: operator('is', 1), one: after[0], two: after[1], query: true, interpolate: [ { context: operator }, { property: 'one' }, { property: 'two' }] }" ,
       isA: ['verb'],
     },
 
@@ -643,7 +643,6 @@ const config = {
         }
 
         // if not isA add to stm
-        // debug.counter('greg57', { breakAt: 1 })
         if (!onePrime.sameWasProcessed && !twoPrime.sameWasProcessed) {
           for (const child of propertyToArray(one)) {
             await api.makeObject({ context: child, config, types: context.two.types || [] })

package/common/dimension.instance.json

@@ -5,7 +5,7 @@
     "dimension and measurement unit are concepts",
     "unit means measurement unit",
     {
-      "apply": "({apis}) => {\n      apis('properties').addHierarchyWatcher({\n        match: ({parentId, isA}) => isA(parentId, 'unit') && parentId.startsWith('unit_'),\n        apply: ({config, childId, parent, parentId}) => {\n          config.updateBridge(childId, ({ bridge }) => {\n            if (!bridge.init) {\n              bridge.init = {}\n            }\n            // bridge.init['dimension'] = parent.object.marker\n            bridge.init['dimension'] = parent.object.value\n          })\n        }\n      })\n    }"
+      "apply": "({apis}) => {\n      apis('properties').addHierarchyWatcher({\n        match: ({parentId, isA}) => isA(parentId, 'unit') && parentId.startsWith('unit_'),\n        apply: ({config, childId, parent, parentId}) => {\n          config.updateBridge(childId, ({ bridge }) => {\n            if (!bridge.initial) {\n              bridge.initial = {}\n            }\n            bridge.initial['dimension'] = parent.object.value\n          })\n        }\n      })\n    }"
     },
     "metric modifies system",
     "imperial modifies system",
@@ -144,12 +144,16 @@
           "id": "amountOfCoordinate",
           "convolution": true,
           "before": [
-            "preposition"
+            "preposition",
+            "propertyMarker"
+          ],
+          "after": [
+            "mathematical_operator"
           ],
           "bridge": "{ marker: next(operator('quantity')), dead: true, unit: after[0], amount: before[0], interpolate: [ { property: 'amount' }, { property: 'unit' } ] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:257",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:258",
           "id": "convertToUnits",
           "bridge": "{ ...next(operator), from: before[0], to: after[0] }",
           "isA": [
@@ -7058,7 +7062,7 @@
       }
     },
     {
-      "apply": "({apis}) => {\n      apis('properties').addHierarchyWatcher({\n        match: ({parentId, isA}) => isA(parentId, 'unit') && parentId.startsWith('unit_'),\n        apply: ({config, childId, parent, parentId}) => {\n          config.updateBridge(childId, ({ bridge }) => {\n            if (!bridge.init) {\n              bridge.init = {}\n            }\n            // bridge.init['dimension'] = parent.object.marker\n            bridge.init['dimension'] = parent.object.value\n          })\n        }\n      })\n    }"
+      "apply": "({apis}) => {\n      apis('properties').addHierarchyWatcher({\n        match: ({parentId, isA}) => isA(parentId, 'unit') && parentId.startsWith('unit_'),\n        apply: ({config, childId, parent, parentId}) => {\n          config.updateBridge(childId, ({ bridge }) => {\n            if (!bridge.initial) {\n              bridge.initial = {}\n            }\n            bridge.initial['dimension'] = parent.object.value\n          })\n        }\n      })\n    }"
     },
     {
       "hierarchy": [
@@ -14411,14 +14415,73 @@
             "atomic": true,
             "dead": true,
             "modifiers": [
-              "determiner",
               "modifier_metric"
             ],
             "focusableForPhrase": true,
             "pullFromContext": true,
             "concept": true,
             "wantsValue": true,
-            "determiner": "the",
+            "checks": [
+              "determiner"
+            ],
+            "determiner": {
+              "modifiers": [],
+              "text": "the",
+              "marker": "the",
+              "word": "the",
+              "range": {
+                "start": 0,
+                "end": 2
+              },
+              "level": 0
+            },
+            "theable": {
+              "value": "metric_system",
+              "number": "one",
+              "text": "metric system",
+              "marker": "metric_system",
+              "word": "system",
+              "range": {
+                "start": 4,
+                "end": 16
+              },
+              "types": [
+                "metric_system",
+                "system"
+              ],
+              "modifier_metric": {
+                "value": "metric",
+                "number": "one",
+                "text": "metric",
+                "marker": "metric",
+                "word": "metric",
+                "range": {
+                  "start": 4,
+                  "end": 9
+                },
+                "types": [
+                  "metric"
+                ],
+                "level": 0
+              },
+              "atomic": true,
+              "dead": true,
+              "modifiers": [
+                "modifier_metric"
+              ],
+              "level": 0
+            },
+            "flatten_ignore": [
+              "theable"
+            ],
+            "interpolate": [
+              {
+                "property": "determiner"
+              },
+              {
+                "property": "theable"
+              }
+            ],
             "level": 0
           },
           "two": {
@@ -16818,14 +16881,73 @@
             "atomic": true,
             "dead": true,
             "modifiers": [
-              "determiner",
               "modifier_imperial"
             ],
             "focusableForPhrase": true,
             "pullFromContext": true,
             "concept": true,
             "wantsValue": true,
-            "determiner": "the",
+            "checks": [
+              "determiner"
+            ],
+            "determiner": {
+              "modifiers": [],
+              "text": "the",
+              "marker": "the",
+              "word": "the",
+              "range": {
+                "start": 0,
+                "end": 2
+              },
+              "level": 0
+            },
+            "theable": {
+              "value": "imperial_system",
+              "number": "one",
+              "text": "imperial system",
+              "marker": "imperial_system",
+              "word": "system",
+              "range": {
+                "start": 4,
+                "end": 18
+              },
+              "types": [
+                "imperial_system",
+                "system"
+              ],
+              "modifier_imperial": {
+                "value": "imperial",
+                "number": "one",
+                "text": "imperial",
+                "marker": "imperial",
+                "word": "imperial",
+                "range": {
+                  "start": 4,
+                  "end": 11
+                },
+                "types": [
+                  "imperial"
+                ],
+                "level": 0
+              },
+              "atomic": true,
+              "dead": true,
+              "modifiers": [
+                "modifier_imperial"
+              ],
+              "level": 0
+            },
+            "flatten_ignore": [
+              "theable"
+            ],
+            "interpolate": [
+              {
+                "property": "determiner"
+              },
+              {
+                "property": "theable"
+              }
+            ],
             "level": 0
           },
           "two": {
@@ -26124,12 +26246,16 @@
           "id": "amountOfCoordinate",
           "convolution": true,
           "before": [
-            "preposition"
+            "preposition",
+            "propertyMarker"
+          ],
+          "after": [
+            "mathematical_operator"
           ],
           "bridge": "{ marker: next(operator('quantity')), dead: true, unit: after[0], amount: before[0], interpolate: [ { property: 'amount' }, { property: 'unit' } ] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:257",
+          "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

@@ -249,7 +249,8 @@ const config = {
     { 
       id: "amountOfCoordinate", 
       convolution: true, 
-      before: ['preposition'],
+      before: ['preposition', 'propertyMarker'],
+      after: ['mathematical_operator'],
       // 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], interpolate: [ { property: 'amount' }, { property: 'unit' } ] }" 
     },
@@ -286,11 +287,10 @@ const template = {
         match: ({parentId, isA}) => isA(parentId, 'unit') && parentId.startsWith('unit_'),
         apply: ({config, childId, parent, parentId}) => {
           config.updateBridge(childId, ({ bridge }) => {
-            if (!bridge.init) {
-              bridge.init = {}
+            if (!bridge.initial) {
+              bridge.initial = {}
             }
-            // bridge.init['dimension'] = parent.object.marker
-            bridge.init['dimension'] = parent.object.value
+            bridge.initial['dimension'] = parent.object.value
           })
         }
       })