tpmkms 9.8.0 → 9.9.0

package/common/numbers.js

@@ -28,53 +28,53 @@ const config = {
     */
     { 
       id: "number", 
-      bridge: "{ instance: false, ...next(operator) }" 
+      bridge: "{ isInstance: false, ...next(operator) }" 
     },
     { 
       id: "integer", 
       isA: ['number'],
-      bridge: "{ instance: false, ...next(operator) }"
+      bridge: "{ isInstance: false, ...next(operator) }"
    },
   ],
   words: {
     "literals": {
-      "one": [{"id": "integer", "initial": "{ value: 1, instance: true }" }],
-      "ones": [{"id": "integer", "initial": "{ value: 1, integer: 'many', instance: true }" }],
-      "two": [{"id": "integer", "initial": "{ value: 2 , instance: true}" }],
-      "twos": [{"id": "integer", "initial": "{ value: 2 , integer: 'many', instance: true}" }],
-      "three": [{"id": "integer", "initial": "{ value: 3, instance: true }" }],
-      "threes": [{"id": "integer", "initial": "{ value: 3, integer: 'many', instance: true }" }],
-      "four": [{"id": "integer", "initial": "{ value: 4, instance: true }" }],
-      "fours": [{"id": "integer", "initial": "{ value: 4, integer: 'many', instance: true }" }],
-      "five": [{"id": "integer", "initial": "{ value: 5, instance: true }" }],
-      "fives": [{"id": "integer", "initial": "{ value: 5, integer: 'many', instance: true }" }],
-      "six": [{"id": "integer", "initial": "{ value: 6, instance: true }" }],
-      "sixes": [{"id": "integer", "initial": "{ value: 6, integer: 'many', instance: true }" }],
-      "seven": [{"id": "integer", "initial": "{ value: 7, instance: true }" }],
-      "sevens": [{"id": "integer", "initial": "{ value: 7, integer: 'many', instance: true }" }],
-      "eight": [{"id": "integer", "initial": "{ value: 8, instance: true }" }],
-      "eights": [{"id": "integer", "initial": "{ value: 8, integer: 'many', instance: true }" }],
-      "nine": [{"id": "integer", "initial": "{ value: 9, instance: true }" }],
-      "nines": [{"id": "integer", "initial": "{ value: 9, integer: 'many', instance: true }" }],
-      "ten": [{"id": "integer", "initial": "{ value: 10, instance: true }" }],
-      "tens": [{"id": "integer", "initial": "{ value: 10, integer: 'many', instance: true }" }],
-      "pi": [{"id": "integer", "initial": { value: 3.1415926, integer: 'many', instance: true } }],
+      "one": [{"id": "integer", "initial": "{ value: 1, isInstance: true }" }],
+      "ones": [{"id": "integer", "initial": "{ value: 1, integer: 'many', isInstance: true }" }],
+      "two": [{"id": "integer", "initial": "{ value: 2 , isInstance: true}" }],
+      "twos": [{"id": "integer", "initial": "{ value: 2 , integer: 'many', isInstance: true}" }],
+      "three": [{"id": "integer", "initial": "{ value: 3, isInstance: true }" }],
+      "threes": [{"id": "integer", "initial": "{ value: 3, integer: 'many', isInstance: true }" }],
+      "four": [{"id": "integer", "initial": "{ value: 4, isInstance: true }" }],
+      "fours": [{"id": "integer", "initial": "{ value: 4, integer: 'many', isInstance: true }" }],
+      "five": [{"id": "integer", "initial": "{ value: 5, isInstance: true }" }],
+      "fives": [{"id": "integer", "initial": "{ value: 5, integer: 'many', isInstance: true }" }],
+      "six": [{"id": "integer", "initial": "{ value: 6, isInstance: true }" }],
+      "sixes": [{"id": "integer", "initial": "{ value: 6, integer: 'many', isInstance: true }" }],
+      "seven": [{"id": "integer", "initial": "{ value: 7, isInstance: true }" }],
+      "sevens": [{"id": "integer", "initial": "{ value: 7, integer: 'many', isInstance: true }" }],
+      "eight": [{"id": "integer", "initial": "{ value: 8, isInstance: true }" }],
+      "eights": [{"id": "integer", "initial": "{ value: 8, integer: 'many', isInstance: true }" }],
+      "nine": [{"id": "integer", "initial": "{ value: 9, isInstance: true }" }],
+      "nines": [{"id": "integer", "initial": "{ value: 9, integer: 'many', isInstance: true }" }],
+      "ten": [{"id": "integer", "initial": "{ value: 10, isInstance: true }" }],
+      "tens": [{"id": "integer", "initial": "{ value: 10, integer: 'many', isInstance: true }" }],
+      "pi": [{"id": "integer", "initial": { value: 3.1415926, integer: 'many', isInstance: true } }],
     },
     patterns: [
       { 
         pattern: [{ type: 'digit' }, { repeat: true }], 
         allow_partial_matches: false, 
-        defs: [{id: "integer", uuid: '1', initial: "{ value: int(text), instance: true }" }]
+        defs: [{id: "integer", uuid: '1', initial: "{ value: int(text), isInstance: true }" }]
       },
       { 
         pattern: [{ type: 'digit' }, { repeat: true }, '.', { type: 'digit' }, { repeat: true }], 
         allow_partial_matches: false, 
-        defs: [{id: "number", uuid: '1', initial: "{ value: float(text), instance: true }" }]
+        defs: [{id: "number", uuid: '1', initial: "{ value: float(text), isInstance: true }" }]
       },
       { 
         pattern: ['.', { type: 'digit' }, { repeat: true }], 
         allow_partial_matches: false, 
-        defs: [{id: "number", uuid: '1', initial: "{ value: float(text), instance: true }" }]
+        defs: [{id: "number", uuid: '1', initial: "{ value: float(text), isInstance: true }" }]
       },
     ],
   },
@@ -137,8 +137,8 @@ knowledgeModule( {
     contents: numbers_tests,
     checks: {
       context: [
-        defaultContextCheck({ marker: 'number', exported: true, extra: ['instance'] }),
-        defaultContextCheck({ match: ({isA, context}) => isA(context.marker, 'integer'), exported: true, extra: ['instance'] }),
+        defaultContextCheck({ marker: 'number', exported: true, extra: ['isInstance'] }),
+        defaultContextCheck({ match: ({isA, context}) => isA(context.marker, 'integer'), exported: true, extra: ['isInstance'] }),
         defaultContextCheck()
       ],
     }

package/common/ordering.instance.json

@@ -203,8 +203,7 @@
             "types": [
               "unknown"
             ],
-            "level": 0,
-            "evaluate": false
+            "level": 0
           },
           "two": {
             "marker": "xfx",
@@ -288,7 +287,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "ordering#call2"
           ]
@@ -779,6 +777,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "wants is xfx between wanter and wantee",
       "key": {
         "query": "wants is xfx between wanter and wantee"
@@ -1361,6 +1362,23 @@
                   ],
                   "level": 0
                 },
+                "relationBacked": false,
+                "orderingArgs": {
+                  "name": "preference",
+                  "marker": "like",
+                  "object": "liker",
+                  "category": "likee"
+                },
+                "relationArgs": [
+                  {
+                    "tag": "liker",
+                    "id": "object"
+                  },
+                  {
+                    "tag": "likee",
+                    "id": "object"
+                  }
+                ],
                 "operator": {
                   "value": "like",
                   "isVerb": true,
@@ -1449,6 +1467,23 @@
                   ],
                   "level": 0
                 },
+                "relationBacked": false,
+                "orderingArgs": {
+                  "name": "preference",
+                  "marker": "love",
+                  "object": "lover",
+                  "category": "lovee"
+                },
+                "relationArgs": [
+                  {
+                    "tag": "lover",
+                    "id": "object"
+                  },
+                  {
+                    "tag": "lovee",
+                    "id": "object"
+                  }
+                ],
                 "operator": {
                   "value": "love",
                   "isVerb": true,
@@ -1542,6 +1577,18 @@
               ],
               "level": 0
             },
+            "relationBacked": false,
+            "orderingArgs": {},
+            "relationArgs": [
+              {
+                "tag": "wanter",
+                "id": "object"
+              },
+              {
+                "tag": "wantee",
+                "id": "object"
+              }
+            ],
             "operator": {
               "value": "want",
               "text": "wants",
@@ -1585,7 +1632,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "ordering#call2"
           ]
@@ -2946,6 +2992,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "if x likes y or x loves y then x wants y",
       "key": {
         "query": "if x likes y or x loves y then x wants y"

package/common/ordinals.js

@@ -16,7 +16,7 @@ const config = {
     { 
       id: "ordinal", 
       isA: ["listable"],
-      bridge: "{ instance: false, ordinal: true, ...next(operator) }",
+      bridge: "{ isInstance: false, ordinal: true, ...next(operator) }",
       initial: { 'notConjunctableWith':['quantity', 'number'] },
     },
     { 
@@ -41,7 +41,7 @@ const config = {
   semantics: [
     {
       where: where(),
-      match: ({context}) => context.marker == 'mentions' && context.evaluate && context.args?.context?.ordinal,
+      match: ({context}) => context.marker == 'mentions' && context.args?.context?.ordinal,
       apply: async ({callId, _continue, toList, context, kms, e, log, toArray, retry}) => {
         // const ordinals = toArray(context.args?.context?.ordinal)
         const lastNotFirst = context.args?.context?.ordinal.value < 0
@@ -87,31 +87,31 @@ const config = {
   ],
   words: {
     "literals": {
-      "first": [{"id": "ordinal", "initial": "{ value: 1, ordinal: true, instance: true }" }],
-      "last": [{"id": "ordinal", "initial": "{ value: -1, ordinal: true, instance: true }" }],
-      "1st": [{"id": "ordinal", "initial": "{ value: 1, ordinal: true, instance: true }" }],
-      "second": [{"id": "ordinal", "initial": "{ value: 2, ordinal: true, instance: true }" }],
-      "2nd": [{"id": "ordinal", "initial": "{ value: 2, ordinal: true, instance: true }" }],
-      "third": [{"id": "ordinal", "initial": "{ value: 3, ordinal: true, instance: true }" }],
-      "3rd": [{"id": "ordinal", "initial": "{ value: 3, ordinal: true, instance: true }" }],
-      "fourth": [{"id": "ordinal", "initial": "{ value: 4, ordinal: true, instance: true }" }],
-      "4rd": [{"id": "ordinal", "initial": "{ value: 4, ordinal: true, instance: true }" }],
-      "fifth": [{"id": "ordinal", "initial": "{ value: 5, ordinal: true, instance: true }" }],
-      "5th": [{"id": "ordinal", "initial": "{ value: 5, ordinal: true, instance: true }" }],
-      "sixth": [{"id": "ordinal", "initial": "{ value: 6, ordinal: true, instance: true }" }],
-      "6th": [{"id": "ordinal", "initial": "{ value: 6, ordinal: true, instance: true }" }],
-      "seventh": [{"id": "ordinal", "initial": "{ value: 7, ordinal: true, instance: true }" }],
-      "7th": [{"id": "ordinal", "initial": "{ value: 7, ordinal: true, instance: true }" }],
-      "eigth": [{"id": "ordinal", "initial": "{ value: 8, ordinal: true, instance: true }" }],
-      "8th": [{"id": "ordinal", "initial": "{ value: 8, ordinal: true, instance: true }" }],
-      "ninth": [{"id": "ordinal", "initial": "{ value: 9, ordinal: true, instance: true }" }],
-      "9th": [{"id": "ordinal", "initial": "{ value: 9, ordinal: true, instance: true }" }],
+      "first": [{"id": "ordinal", "initial": "{ value: 1, ordinal: true, isInstance: true }" }],
+      "last": [{"id": "ordinal", "initial": "{ value: -1, ordinal: true, isInstance: true }" }],
+      "1st": [{"id": "ordinal", "initial": "{ value: 1, ordinal: true, isInstance: true }" }],
+      "second": [{"id": "ordinal", "initial": "{ value: 2, ordinal: true, isInstance: true }" }],
+      "2nd": [{"id": "ordinal", "initial": "{ value: 2, ordinal: true, isInstance: true }" }],
+      "third": [{"id": "ordinal", "initial": "{ value: 3, ordinal: true, isInstance: true }" }],
+      "3rd": [{"id": "ordinal", "initial": "{ value: 3, ordinal: true, isInstance: true }" }],
+      "fourth": [{"id": "ordinal", "initial": "{ value: 4, ordinal: true, isInstance: true }" }],
+      "4rd": [{"id": "ordinal", "initial": "{ value: 4, ordinal: true, isInstance: true }" }],
+      "fifth": [{"id": "ordinal", "initial": "{ value: 5, ordinal: true, isInstance: true }" }],
+      "5th": [{"id": "ordinal", "initial": "{ value: 5, ordinal: true, isInstance: true }" }],
+      "sixth": [{"id": "ordinal", "initial": "{ value: 6, ordinal: true, isInstance: true }" }],
+      "6th": [{"id": "ordinal", "initial": "{ value: 6, ordinal: true, isInstance: true }" }],
+      "seventh": [{"id": "ordinal", "initial": "{ value: 7, ordinal: true, isInstance: true }" }],
+      "7th": [{"id": "ordinal", "initial": "{ value: 7, ordinal: true, isInstance: true }" }],
+      "eigth": [{"id": "ordinal", "initial": "{ value: 8, ordinal: true, isInstance: true }" }],
+      "8th": [{"id": "ordinal", "initial": "{ value: 8, ordinal: true, isInstance: true }" }],
+      "ninth": [{"id": "ordinal", "initial": "{ value: 9, ordinal: true, isInstance: true }" }],
+      "9th": [{"id": "ordinal", "initial": "{ value: 9, ordinal: true, isInstance: true }" }],
     },
     patterns: [
-      { "pattern": [{ type: 'digit' }, { repeat: true }, 'th'], defs: [{id: "ordinal", uuid: '1', initial: "{ value: int(substr(text, -2)), ordinal: true, instance: true }" }]},
-      { "pattern": [{ type: 'digit' }, { repeat: true }, '1st'], defs: [{id: "ordinal", uuid: '1', initial: "{ value: int(substr(text, -2)), ordinal: true, instance: true }" }]},
-      { "pattern": [{ type: 'digit' }, { repeat: true }, '2nd'], defs: [{id: "ordinal", uuid: '1', initial: "{ value: int(substr(text, -2)), ordinal: true, instance: true }" }]},
-      { "pattern": [{ type: 'digit' }, { repeat: true }, '3rd'], defs: [{id: "ordinal", uuid: '1', initial: "{ value: int(substr(text, -2)), ordinal: true, instance: true }" }]},
+      { "pattern": [{ type: 'digit' }, { repeat: true }, 'th'], defs: [{id: "ordinal", uuid: '1', initial: "{ value: int(substr(text, -2)), ordinal: true, isInstance: true }" }]},
+      { "pattern": [{ type: 'digit' }, { repeat: true }, '1st'], defs: [{id: "ordinal", uuid: '1', initial: "{ value: int(substr(text, -2)), ordinal: true, isInstance: true }" }]},
+      { "pattern": [{ type: 'digit' }, { repeat: true }, '2nd'], defs: [{id: "ordinal", uuid: '1', initial: "{ value: int(substr(text, -2)), ordinal: true, isInstance: true }" }]},
+      { "pattern": [{ type: 'digit' }, { repeat: true }, '3rd'], defs: [{id: "ordinal", uuid: '1', initial: "{ value: int(substr(text, -2)), ordinal: true, isInstance: true }" }]},
     ],
   },
 };

package/common/people.instance.json

@@ -110,7 +110,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "people#call2"
           ]
@@ -256,6 +255,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "first modifies name",
       "key": {
         "query": "first modifies name"
@@ -361,7 +363,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "people#call2"
           ]
@@ -507,6 +508,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "last modifies name",
       "key": {
         "query": "last modifies name"
@@ -652,7 +656,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "people#call2"
           ]
@@ -818,6 +821,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "surname means last name",
       "key": {
         "query": "surname means last name"
@@ -923,7 +929,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "people#call2"
           ]
@@ -1069,6 +1074,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "given modifies name",
       "key": {
         "query": "given modifies name"
@@ -1244,7 +1252,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "metaInfo": "The mapping from from the expression being defined \"given name\" to the definition phrase \"first name\" is []",
           "touchedBy": [
             "people#call2"
@@ -1421,6 +1428,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "given name means first name",
       "key": {
         "query": "given name means first name"
@@ -1591,6 +1601,8 @@
             "dead": true,
             "isEd": true,
             "subject": "ownee",
+            "beforeTag": "owner",
+            "afterTag": "ownee",
             "ownee": {
               "operator": {
                 "marker": "owned",
@@ -1689,6 +1701,18 @@
               ],
               "level": 0
             },
+            "relationBacked": true,
+            "orderingArgs": {},
+            "relationArgs": [
+              {
+                "tag": "owner",
+                "id": "owner"
+              },
+              {
+                "tag": "ownee",
+                "id": "ownee"
+              }
+            ],
             "operator": {
               "value": "owns",
               "isVerb": true,
@@ -1729,7 +1753,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "metaInfo": "The mapping from from the expression being defined \"ownee is owned by owner\" to the definition phrase \"owner owns ownee\" is [{\"from\":[\"ownee\"],\"to\":[\"ownee\"]},{\"from\":[\"owner\"],\"to\":[\"owner\"]},{\"from\":[\"number\"],\"to\":[\"number\"]}]",
           "touchedBy": [
             "people#call2"
@@ -2181,6 +2204,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "ownee is owned by owner means owner owns ownee",
       "key": {
         "query": "ownee is owned by owner means owner owns ownee"
@@ -2319,7 +2345,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "people#call2"
           ]
@@ -2500,6 +2525,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "gender is a property type",
       "key": {
         "query": "gender is a property type"
@@ -2723,7 +2751,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "people#call2"
           ]
@@ -3014,6 +3041,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "male and female are genders",
       "key": {
         "query": "male and female are genders"
@@ -3186,6 +3216,22 @@
             "types": [
               "ownee"
             ],
+            "isEdProperties": [
+              "ownee",
+              "owner"
+            ],
+            "relationBacked": true,
+            "orderingArgs": null,
+            "relationArgs": [
+              {
+                "tag": "owner",
+                "id": "owner"
+              },
+              {
+                "tag": "ownee",
+                "id": "ownee"
+              }
+            ],
             "constraints": [
               {
                 "property": "ownee",
@@ -3221,6 +3267,8 @@
                   },
                   "dead": true,
                   "constrained": true,
+                  "beforeTag": "owner",
+                  "afterTag": "ownee",
                   "owner": {
                     "marker": "unknown",
                     "implicit": true,
@@ -3256,8 +3304,7 @@
           "dead": true,
           "level": 2,
           "context_index": 1,
-          "topLevel": true,
-          "context_id": 2
+          "topLevel": true
         }
       ],
       "generated": [
@@ -3565,6 +3612,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "ownervar is owneevar owned by",
       "skipSemantics": true,
       "key": {
@@ -3713,6 +3763,8 @@
           "dead": true,
           "isEd": true,
           "subject": "ownee",
+          "beforeTag": "owner",
+          "afterTag": "ownee",
           "ownee": {
             "operator": {
               "marker": "owned",
@@ -3773,8 +3825,7 @@
           },
           "level": 1,
           "context_index": 1,
-          "topLevel": true,
-          "context_id": 2
+          "topLevel": true
         }
       ],
       "generated": [
@@ -4082,6 +4133,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "owneevar is owned by ownervar",
       "skipSemantics": true,
       "key": {

package/common/percentages.js

@@ -12,6 +12,7 @@ const config = {
   bridges: [
     { 
       id: "percent", 
+      where: where(),
       words: ['percent', '%'],
       separators: '?',
       bridge: "{ ...next(operator), modifiers: ['scale'], scale: before[0] }",
@@ -19,11 +20,12 @@ const config = {
     },
     { 
       id: "percentageOf", 
+      where: where(),
       words: ['percent', '%'],
       bridge: "{ ...next(operator), percentage: before[0], isResponse: true, semanticIsEvaluate: true, value: after[0] }",
-      evaluator: async ({context, e}) => {
+      semantic: async ({context, e}) => {
         const scale = context.percentage.scale
-        const number = await e(context.value)
+        const number = await e(context.value, where())
         const percentage = number.value * scale.value / 100
         const result = { ...number, value: percentage, evalue: percentage, word: null, text: null }
         context.evalue = result