tpmkms 8.1.0-beta.0 → 8.1.0-beta.1

package/common/formulas.instance.json

@@ -766,7 +766,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [

package/common/gdefaults.js

@@ -44,6 +44,12 @@ let config = {
       }
     },
 
+    {
+      where: where(),
+      match: ({context}) => context.evalue,
+      apply: async ({context, g}) => await g(context.evalue)
+    },
+
     {
       where: where(),
       //({context}) => context.paraphrase && context.modifiers,
@@ -152,12 +158,6 @@ let config = {
       apply: ({context}) => context.verbatim
     },
 
-    {
-      where: where(),
-      match: ({context}) => context.evalue,
-      apply: async ({context, g}) => await g(context.evalue)
-    },
-
     {
       where: where(),
       match: ({context}) => context.value && Array.isArray(context.value),

package/common/helpers/concept.js

@@ -70,7 +70,7 @@ class API {
       config.addOperator({ pattern: `([${objectId}|])`, allowDups: true })
     }
 
-    if (object.unknown) {
+    if (object.unknown || object.marker !== objectId) {
       config.addWord(objectSingular, { id: objectId, initial: `{ value: '${objectId}', number: 'one' }`})
       config.addWord(objectPlural, { id: objectId, initial: `{ value: '${objectId}', number: 'many' }`})
     }

package/common/helpers/properties.js

@@ -104,6 +104,7 @@ class API {
              localHierarchy,
              bridge: `{ 
                ...before, 
+               marker: '${after[0].tag}',
                constraints: [ 
                     { 
                        property: '${after[0].tag}', 
@@ -329,14 +330,25 @@ class API {
     } else {
       config.addOperator({ pattern: `(${beforeOperators} [${operator}|] ${afterOperators})`, allowDups: true })
     }
- 
-    for (let argument of before.concat(after)) {
-      if (create.includes(argument.id)) {
-        // config.addHierarchy('unknown', argument.id)
-        // config.addHierarchy('what', argument.id)
-        // greg23 <<<<<<<<<<<< doing this
-        config.addHierarchy(argument.id, 'unknown')
-        config.addHierarchy(argument.id, 'what')
+
+    if (false) {
+      for (let argument of before.concat(after)) {
+        if (create.includes(argument.id)) {
+          // config.addHierarchy('unknown', argument.id)
+          // config.addHierarchy('what', argument.id)
+          // greg23 <<<<<<<<<<<< doing this
+          config.addHierarchy(argument.id, 'unknown')
+          config.addHierarchy(argument.id, 'what')
+        }
+      } 
+    } else {
+      for (let argument of before.concat(after)) {
+        if (create.includes(argument.id)) {
+          // config.addHierarchy(argument.id, 'unknown')
+          // config.addHierarchy(argument.id, 'what')
+          localHierarchy.push([argument.id, 'unknown'])
+          localHierarchy.push([argument.id, 'what'])
+        }
       }
     }
 

package/common/hierarchy.js

@@ -52,6 +52,7 @@ let config = {
     ['have', 'canBeDoQuestion'],
   ],
   priorities: [
+    { "context": [['isEd', 0], ['is', 0], ], "choose": [1] },
     { "context": [['a', 0], ['questionMark', 0], ['is', 0], ], "choose": [0] },
     // [['is', 0], ['hierarchyAble', 0]],
     // [['a', 0], ['is', 0], ['hierarchyAble', 0]],

package/common/kirk.instance.json

@@ -1237,7 +1237,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -1352,12 +1352,7 @@
         ],
         [
           "weapon",
-          "unknown",
-          false
-        ],
-        [
           "weapon",
-          "what",
           false
         ],
         [

package/common/length.instance.json

@@ -821,7 +821,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -2003,7 +2003,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -2166,7 +2166,7 @@
             ],
             "ops": [
               [
-                "isEd",
+                "is",
                 0
               ],
               [
@@ -2211,7 +2211,7 @@
             ],
             "ops": [
               [
-                "isEd",
+                "is",
                 0
               ],
               [
@@ -2252,7 +2252,7 @@
             ],
             "ops": [
               [
-                "isEd",
+                "is",
                 0
               ],
               [
@@ -2289,7 +2289,7 @@
             ],
             "ops": [
               [
-                "isEd",
+                "is",
                 0
               ],
               [
@@ -2322,7 +2322,7 @@
             ],
             "ops": [
               [
-                "isEd",
+                "is",
                 0
               ],
               [
@@ -2351,7 +2351,7 @@
             ],
             "ops": [
               [
-                "isEd",
+                "is",
                 0
               ],
               [
@@ -2533,6 +2533,7 @@
             },
             "types": [
               "list",
+              "queryable",
               "unknown"
             ],
             "listable": true,
@@ -2549,6 +2550,10 @@
                   "end": 4
                 },
                 "dead": true,
+                "types": [
+                  "queryable",
+                  "unknown"
+                ],
                 "level": 1
               },
               {
@@ -2562,6 +2567,10 @@
                   "end": 15
                 },
                 "dead": true,
+                "types": [
+                  "queryable",
+                  "unknown"
+                ],
                 "level": 1
               },
               {
@@ -2574,6 +2583,10 @@
                   "start": 17,
                   "end": 20
                 },
+                "types": [
+                  "queryable",
+                  "unknown"
+                ],
                 "dead": true,
                 "level": 1
               },
@@ -2587,6 +2600,10 @@
                   "start": 26,
                   "end": 29
                 },
+                "types": [
+                  "queryable",
+                  "unknown"
+                ],
                 "dead": true,
                 "level": 1
               }
@@ -2691,11 +2708,19 @@
           ],
           [
             "list",
-            1
+            0
           ],
           [
             "propertyOf",
             0
+          ],
+          [
+            "unit",
+            0
+          ],
+          [
+            "unknown",
+            0
           ]
         ],
         [
@@ -2709,7 +2734,7 @@
           ],
           [
             "list",
-            1
+            0
           ],
           [
             "propertyOf",
@@ -2718,6 +2743,14 @@
           [
             "unit",
             0
+          ],
+          [
+            "unknown",
+            0
+          ],
+          [
+            "unknown",
+            1
           ]
         ],
         [
@@ -2731,7 +2764,7 @@
           ],
           [
             "list",
-            1
+            0
           ],
           [
             "propertyOf",
@@ -2752,13 +2785,7 @@
             0
           ],
           [
-            "list",
-            1
-          ]
-        ],
-        [
-          [
-            "is",
+            "length",
             0
           ],
           [
@@ -2775,23 +2802,13 @@
             "is",
             0
           ],
-          [
-            "list",
-            1
-          ],
-          [
-            "propertyOf",
-            1
-          ]
-        ],
-        [
           [
             "length",
             0
           ],
           [
             "list",
-            0
+            1
           ],
           [
             "propertyOf",
@@ -2800,20 +2817,20 @@
           [
             "unit",
             0
-          ],
-          [
-            "unknown",
-            0
           ]
         ],
         [
+          [
+            "is",
+            0
+          ],
           [
             "length",
             0
           ],
           [
             "list",
-            0
+            1
           ],
           [
             "propertyOf",
@@ -2825,38 +2842,36 @@
           ],
           [
             "unknown",
+            1
+          ]
+        ],
+        [
+          [
+            "is",
             0
           ],
           [
-            "unknown",
+            "list",
             1
           ]
         ],
         [
           [
-            "length",
+            "is",
             0
           ],
           [
             "list",
-            0
+            1
           ],
           [
             "propertyOf",
             0
-          ],
-          [
-            "unit",
-            0
-          ],
-          [
-            "unknown",
-            1
           ]
         ],
         [
           [
-            "length",
+            "is",
             0
           ],
           [
@@ -2865,14 +2880,6 @@
           ],
           [
             "propertyOf",
-            0
-          ],
-          [
-            "unit",
-            0
-          ],
-          [
-            "unknown",
             1
           ]
         ]
@@ -3847,7 +3854,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -5243,7 +5250,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -6639,7 +6646,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -8048,7 +8055,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -9467,7 +9474,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -10886,7 +10893,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -12295,7 +12302,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -13691,7 +13698,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -15087,7 +15094,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -16483,7 +16490,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -17870,7 +17877,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -19279,7 +19286,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -20698,7 +20705,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -22154,11 +22161,19 @@
       ],
       [
         "list",
-        1
+        0
       ],
       [
         "propertyOf",
         0
+      ],
+      [
+        "unit",
+        0
+      ],
+      [
+        "unknown",
+        0
       ]
     ],
     [
@@ -22172,7 +22187,7 @@
       ],
       [
         "list",
-        1
+        0
       ],
       [
         "propertyOf",
@@ -22181,6 +22196,14 @@
       [
         "unit",
         0
+      ],
+      [
+        "unknown",
+        0
+      ],
+      [
+        "unknown",
+        1
       ]
     ],
     [
@@ -22194,7 +22217,7 @@
       ],
       [
         "list",
-        1
+        0
       ],
       [
         "propertyOf",
@@ -22215,13 +22238,7 @@
         0
       ],
       [
-        "list",
-        1
-      ]
-    ],
-    [
-      [
-        "is",
+        "length",
         0
       ],
       [
@@ -22238,23 +22255,13 @@
         "is",
         0
       ],
-      [
-        "list",
-        1
-      ],
-      [
-        "propertyOf",
-        1
-      ]
-    ],
-    [
       [
         "length",
         0
       ],
       [
         "list",
-        0
+        1
       ],
       [
         "propertyOf",
@@ -22263,20 +22270,20 @@
       [
         "unit",
         0
-      ],
-      [
-        "unknown",
-        0
       ]
     ],
     [
+      [
+        "is",
+        0
+      ],
       [
         "length",
         0
       ],
       [
         "list",
-        0
+        1
       ],
       [
         "propertyOf",
@@ -22288,38 +22295,36 @@
       ],
       [
         "unknown",
+        1
+      ]
+    ],
+    [
+      [
+        "is",
         0
       ],
       [
-        "unknown",
+        "list",
         1
       ]
     ],
     [
       [
-        "length",
+        "is",
         0
       ],
       [
         "list",
-        0
+        1
       ],
       [
         "propertyOf",
         0
-      ],
-      [
-        "unit",
-        0
-      ],
-      [
-        "unknown",
-        1
       ]
     ],
     [
       [
-        "length",
+        "is",
         0
       ],
       [
@@ -22328,14 +22333,6 @@
       ],
       [
         "propertyOf",
-        0
-      ],
-      [
-        "unit",
-        0
-      ],
-      [
-        "unknown",
         1
       ]
     ]