tpmkms_4wp 8.0.0-beta.0 → 8.0.0-beta.2

package/common/pressure.instance.json

@@ -244,6 +244,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -1200,6 +1204,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -1810,35 +1818,6 @@
             ],
             "counter": 3
           },
-          {
-            "op": [
-              "list",
-              1
-            ],
-            "ops": [
-              [
-                "list",
-                1
-              ],
-              [
-                "is",
-                0
-              ],
-              [
-                "unit",
-                0
-              ],
-              [
-                "propertyOf",
-                0
-              ],
-              [
-                "pressure",
-                0
-              ]
-            ],
-            "counter": 4
-          },
           {
             "op": [
               "unit",
@@ -1862,7 +1841,7 @@
                 0
               ]
             ],
-            "counter": 5
+            "counter": 4
           },
           {
             "op": [
@@ -1883,7 +1862,7 @@
                 0
               ]
             ],
-            "counter": 6
+            "counter": 5
           },
           {
             "op": [
@@ -1900,7 +1879,7 @@
                 0
               ]
             ],
-            "counter": 7
+            "counter": 6
           },
           {
             "op": [
@@ -1917,7 +1896,7 @@
                 1
               ]
             ],
-            "counter": 8
+            "counter": 7
           },
           {
             "op": [
@@ -1930,7 +1909,7 @@
                 0
               ]
             ],
-            "counter": 9
+            "counter": 8
           },
           {
             "op": [
@@ -1943,7 +1922,7 @@
                 1
               ]
             ],
-            "counter": 10
+            "counter": 9
           }
         ]
       },
@@ -1961,7 +1940,19 @@
           "one": {
             "number": "many",
             "marker": "list",
+            "default": true,
+            "word": "and",
+            "text": "pascals and atmospheres",
+            "range": {
+              "start": 0,
+              "end": 44
+            },
+            "types": [
+              "list",
+              "unknown"
+            ],
             "listable": true,
+            "isList": true,
             "value": [
               {
                 "value": "pascals",
@@ -1974,7 +1965,7 @@
                   "end": 6
                 },
                 "dead": true,
-                "level": 2
+                "level": 1
               },
               {
                 "value": "atmospheres",
@@ -1987,18 +1978,9 @@
                   "end": 22
                 },
                 "dead": true,
-                "level": 2
+                "level": 1
               }
             ],
-            "range": {
-              "start": 0,
-              "end": 44
-            },
-            "types": [
-              "list",
-              "unknown"
-            ],
-            "text": "pascals and atmospheres are units of pressure",
             "level": 1
           },
           "two": {
@@ -2525,6 +2507,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -3178,7 +3164,7 @@
       "trace": "undefined",
       "contexts": [
         {
-          "value": "=",
+          "value": "equals",
           "text": "pascals = atmospheres * 101325",
           "marker": "equals",
           "word": "=",
@@ -3616,6 +3602,10 @@
           "divideByOperator",
           "mathematicalOperator"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "expression",
           "expression"
@@ -4269,7 +4259,7 @@
       "trace": "undefined",
       "contexts": [
         {
-          "value": "=",
+          "value": "equals",
           "text": "atmospheres = pascals / 101325",
           "marker": "equals",
           "word": "=",

package/common/properties.instance.json

@@ -32,6 +32,10 @@
           "concept",
           "theAble"
         ],
+        [
+          "doubleQuote",
+          "queryable"
+        ],
         [
           "have",
           "canBeDoQuestion"

package/common/properties.js

@@ -153,7 +153,12 @@ let configStruct = {
     { id: "doesnt", level: 0, bridge: "{ ...context, number: operator.number, object.number: operator.number, negation: true }*" },
     { id: "have", level: 0, bridge: "{ ...next(operator), object: { number: operator.number, ...before }, property: after[0], do: { left: 'object', right: 'property' } }" },
     { id: "have", level: 1, bridge: "{ ...next(operator) }" },
-    { id: "property", level: 0, bridge: "{ ...next(operator) }" },
+    { 
+      id: "property", 
+      words: ['properties'],
+      level: 0, 
+      bridge: "{ ...next(operator) }" 
+    },
     { id: "object", level: 0, bridge: "{ ...next(operator) }" },
 
     // old
@@ -266,7 +271,6 @@ let configStruct = {
 //     */
 //     where: where(),
 //     match: ({context}) => {
-//       // debugger;
 //       if (!context.paraphrase) {
 //         return
 //       }
@@ -565,15 +569,12 @@ let configStruct = {
         /*
         const propertyId = context.marker
         if (context.marker != context.value) {
-          debugger
-          debugger // target
         }
         */
         // const propertyId = context.marker
         /*
         // greg HERE
         */
-        // debugger;
         propertyContext[`disable${uuid}`] = true
         const propertyId = km("dialogues").api.evaluateToConcept(propertyContext, context, log, s).evalue;
         try{
@@ -661,7 +662,6 @@ let configStruct = {
             // TODO maybe this I aware so it can say "I don't know about blah..." and below
             // if (currentContext.unknown || !currentContext.value) {
             if (!api.conceptExists(currentContext.value)) {
-              // debugger;
               // api.conceptExists(currentContext)
               const objectPhrase = g({...currentContext, paraphrase: true})
               context.verbatim = `What "${objectPhrase}" means is unknown`
@@ -708,7 +708,7 @@ knowledgeModule( {
     contents: properties_tests,
     checks: {
       context: defaultContextCheck,
-      xobjects: [
+      objects: [
         'children', 
         'concept', 
         'parents',