tpmkms 9.7.1-beta.11 → 9.7.1-beta.12

package/common/actions.instance.json

@@ -166,7 +166,7 @@
       },
       "semantics": [
         {
-          "match": "({context, isA}) => !context.pullFromContext && (isA(context.marker, 'action') || isA(context.marker, 'doAction'))",
+          "match": "({context, isA, stack, namespaced}) => !context.pullFromContext && !context.evaluate && (isA(context.marker, 'action') || isA(context.marker, 'doAction')) && !namespaced.get('actions', context, 'logged')",
           "apply": "async ({context, _continue, testLog, g, remember}) => {\n        remember(context)\n        await testLog(() => g(context))\n        _continue()\n      }"
         }
       ]
@@ -397,6 +397,11 @@
           "adjective",
           false
         ],
+        [
+          "ageMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "all",
           "quantifier",
@@ -2102,6 +2107,11 @@
           "thisAble",
           false
         ],
+        [
+          "propertyMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "propertyOf",
           "preposition",

package/common/actions.js

@@ -147,7 +147,7 @@ const config = {
     {
       where: where(),
       priority: -1,
-      match: ({context, isA}) => !context.pullFromContext && (isA(context.marker, 'action') || isA(context.marker, 'doAction')),
+      match: ({context, isA, stack, namespaced}) => !context.pullFromContext && !context.evaluate && (isA(context.marker, 'action') || isA(context.marker, 'doAction')) && !namespaced.get('actions', context, 'logged'),
       apply: async ({context, _continue, testLog, g, remember}) => {
         remember(context)
         await testLog(() => g(context))

package/common/comparable.instance.json

@@ -2774,7 +2774,8 @@
               "queryable",
               "unknown"
             ],
-            "level": 0
+            "level": 0,
+            "evaluate": false
           },
           "two": {
             "value": "concepts",
@@ -3493,7 +3494,8 @@
               "queryable",
               "unknown"
             ],
-            "level": 0
+            "level": 0,
+            "evaluate": false
           },
           "two": {
             "value": "condition",
@@ -4528,7 +4530,8 @@
                 "types": [
                   "unknown"
                 ],
-                "level": 0
+                "level": 0,
+                "evaluate": false
               },
               {
                 "value": "lowest",
@@ -4559,7 +4562,8 @@
                 "types": [
                   "unknown"
                 ],
-                "level": 0
+                "level": 0,
+                "evaluate": false
               },
               {
                 "value": "maximum",
@@ -4575,7 +4579,8 @@
                 "types": [
                   "unknown"
                 ],
-                "level": 0
+                "level": 0,
+                "evaluate": false
               },
               {
                 "value": "minimum",
@@ -4591,7 +4596,8 @@
                 "types": [
                   "unknown"
                 ],
-                "level": 0
+                "level": 0,
+                "evaluate": false
               }
             ],
             "level": 1

package/common/crew.instance.json

@@ -33137,6 +33137,24 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "propertyOf",
+            0
+          ],
+          [
+            "the",
+            0
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -51073,32 +51091,6 @@
             0
           ]
         ],
-        [
-          [
-            "arm",
-            0
-          ],
-          [
-            "means",
-            0
-          ],
-          [
-            "propertyOf",
-            0
-          ],
-          [
-            "status",
-            0
-          ],
-          [
-            "the",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "arm",
@@ -54812,40 +54804,6 @@
             0
           ]
         ],
-        [
-          [
-            "disarm",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "means",
-            0
-          ],
-          [
-            "not",
-            0
-          ],
-          [
-            "propertyOf",
-            0
-          ],
-          [
-            "status",
-            0
-          ],
-          [
-            "the",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "disarm",
@@ -56489,32 +56447,6 @@
         0
       ]
     ],
-    [
-      [
-        "arm",
-        0
-      ],
-      [
-        "means",
-        0
-      ],
-      [
-        "propertyOf",
-        0
-      ],
-      [
-        "status",
-        0
-      ],
-      [
-        "the",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "arm",
@@ -56613,40 +56545,6 @@
         0
       ]
     ],
-    [
-      [
-        "disarm",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "means",
-        0
-      ],
-      [
-        "not",
-        0
-      ],
-      [
-        "propertyOf",
-        0
-      ],
-      [
-        "status",
-        0
-      ],
-      [
-        "the",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "disarm",
@@ -57395,6 +57293,24 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "propertyOf",
+        0
+      ],
+      [
+        "the",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "is",

package/common/dimension.instance.json

@@ -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": [
@@ -26124,12 +26128,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' } ] }" 
     },