tpmkms 8.1.0 → 8.3.0-beta.0

package/common/math.instance.json

@@ -384,6 +384,11 @@
           "ifAble",
           false
         ],
+        [
+          "integer",
+          "number",
+          false
+        ],
         [
           "is",
           "canBeQuestion",
@@ -686,7 +691,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [

package/common/numbers.js

@@ -14,37 +14,44 @@ let config = {
   name: 'numbers',
   operators: [
     "([number])",
+    "([integer])",
   ],
   bridges: [
-    { "id": "number", "level": 0, "bridge": "{ instance: false, ...next(operator) }" },
+    { 
+      id: "number", 
+      bridge: "{ instance: false, ...next(operator) }" 
+    },
+    { 
+      id: "integer", 
+      isA: ['number'],
+      bridge: "{ instance: false, ...next(operator) }"
+   },
   ],
-  debug: false,
-  version: '3',
   words: {
     "literals": {
-      "one": [{"id": "number", "initial": "{ value: 1, instance: true }" }],
-      "ones": [{"id": "number", "initial": "{ value: 1, number: 'many', instance: true }" }],
-      "two": [{"id": "number", "initial": "{ value: 2 , instance: true}" }],
-      "twos": [{"id": "number", "initial": "{ value: 2 , number: 'many', instance: true}" }],
-      "three": [{"id": "number", "initial": "{ value: 3, instance: true }" }],
-      "threes": [{"id": "number", "initial": "{ value: 3, number: 'many', instance: true }" }],
-      "four": [{"id": "number", "initial": "{ value: 4, instance: true }" }],
-      "fours": [{"id": "number", "initial": "{ value: 4, number: 'many', instance: true }" }],
-      "five": [{"id": "number", "initial": "{ value: 5, instance: true }" }],
-      "fives": [{"id": "number", "initial": "{ value: 5, number: 'many', instance: true }" }],
-      "six": [{"id": "number", "initial": "{ value: 6, instance: true }" }],
-      "sixes": [{"id": "number", "initial": "{ value: 6, number: 'many', instance: true }" }],
-      "seven": [{"id": "number", "initial": "{ value: 7, instance: true }" }],
-      "sevens": [{"id": "number", "initial": "{ value: 7, number: 'many', instance: true }" }],
-      "eight": [{"id": "number", "initial": "{ value: 8, instance: true }" }],
-      "eights": [{"id": "number", "initial": "{ value: 8, number: 'many', instance: true }" }],
-      "nine": [{"id": "number", "initial": "{ value: 9, instance: true }" }],
-      "nines": [{"id": "number", "initial": "{ value: 9, number: 'many', instance: true }" }],
-      "ten": [{"id": "number", "initial": "{ value: 10, instance: true }" }],
-      "tens": [{"id": "number", "initial": "{ value: 10, number: 'many', instance: true }" }],
+      "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 }" }],
     },
     patterns: [
-      { "pattern": [{ type: 'digit' }, { repeat: true }], defs: [{id: "number", uuid: '1', initial: "{ value: int(text), instance: true }" }]},
+      { "pattern": [{ type: 'digit' }, { repeat: true }], defs: [{id: "integer", uuid: '1', initial: "{ value: int(text), instance: true }" }]},
       { "pattern": [{ type: 'digit' }, { repeat: true }, '.', { type: 'digit' }, { repeat: true }], defs: [{id: "number", uuid: '1', initial: "{ value: float(text), instance: true }" }]},
       { "pattern": ['.', { type: 'digit' }, { repeat: true }], defs: [{id: "number", uuid: '1', initial: "{ value: float(text), instance: true }" }]},
     ],
@@ -58,7 +65,7 @@ let config = {
   generators: [
     { 
       where: where(),
-      match: ({context}) => context.marker == 'number' && context.leadingZeros && context.value >= 0, 
+      match: ({context, isA}) => isA(context.marker, 'number', { extended: true }) && context.leadingZeros && context.value >= 0, 
       apply: ({context}) => {
         value = `${context.value}` 
         if (value.length < context.length) {
@@ -69,12 +76,12 @@ let config = {
     },
     { 
       where: where(),
-      match: ({context}) => context.marker == 'number' && context.number == 'many', 
+      match: ({context}) => ['number', 'integer'].includes(context.marker) && context.number == 'many', 
       apply: ({context}) => `${context.value}'s` 
     },
     { 
       where: where(),
-      match: ({context}) => context.marker == 'number', 
+      match: ({context}) => ['number', 'integer'].includes(context.marker),
       apply: ({context}) => `${context.value}` 
     },
   ],

package/common/numbers.test.json

@@ -9,7 +9,7 @@
         "dead": true,
         "instance": true,
         "level": 1,
-        "marker": "number",
+        "marker": "integer",
         "range": {
           "end": 1,
           "start": 0
@@ -28,12 +28,12 @@
         {
           "counter": 1,
           "op": [
-            "number",
+            "integer",
             0
           ],
           "ops": [
             [
-              "number",
+              "integer",
               0
             ]
           ]
@@ -43,12 +43,18 @@
     "objects": {
       "nameToUUID": {
         "gdefaults": "gdefaults2",
-        "numbers": "numbers1"
+        "numbers": "numbers1",
+        "sdefaults": "sdefaults2",
+        "tokenize": "tokenize2"
       },
       "namespaced": {
         "gdefaults2": {
         },
         "numbers1": {
+        },
+        "sdefaults2": {
+        },
+        "tokenize2": {
         }
       },
       "processed": [
@@ -57,7 +63,7 @@
             "dead": true,
             "instance": true,
             "level": 1,
-            "marker": "number",
+            "marker": "integer",
             "range": {
               "end": 1,
               "start": 0
@@ -97,7 +103,7 @@
         "dead": true,
         "instance": true,
         "level": 1,
-        "marker": "number",
+        "marker": "integer",
         "range": {
           "end": 1,
           "start": 0
@@ -116,12 +122,12 @@
         {
           "counter": 1,
           "op": [
-            "number",
+            "integer",
             0
           ],
           "ops": [
             [
-              "number",
+              "integer",
               0
             ]
           ]
@@ -131,12 +137,18 @@
     "objects": {
       "nameToUUID": {
         "gdefaults": "gdefaults2",
-        "numbers": "numbers1"
+        "numbers": "numbers1",
+        "sdefaults": "sdefaults2",
+        "tokenize": "tokenize2"
       },
       "namespaced": {
         "gdefaults2": {
         },
         "numbers1": {
+        },
+        "sdefaults2": {
+        },
+        "tokenize2": {
         }
       },
       "processed": [
@@ -145,7 +157,7 @@
             "dead": true,
             "instance": true,
             "level": 1,
-            "marker": "number",
+            "marker": "integer",
             "range": {
               "end": 1,
               "start": 0
@@ -185,7 +197,7 @@
         "dead": true,
         "instance": true,
         "level": 1,
-        "marker": "number",
+        "marker": "integer",
         "range": {
           "end": 1,
           "start": 0
@@ -204,12 +216,12 @@
         {
           "counter": 1,
           "op": [
-            "number",
+            "integer",
             0
           ],
           "ops": [
             [
-              "number",
+              "integer",
               0
             ]
           ]
@@ -219,12 +231,18 @@
     "objects": {
       "nameToUUID": {
         "gdefaults": "gdefaults2",
-        "numbers": "numbers1"
+        "numbers": "numbers1",
+        "sdefaults": "sdefaults2",
+        "tokenize": "tokenize2"
       },
       "namespaced": {
         "gdefaults2": {
         },
         "numbers1": {
+        },
+        "sdefaults2": {
+        },
+        "tokenize2": {
         }
       },
       "processed": [
@@ -233,7 +251,7 @@
             "dead": true,
             "instance": true,
             "level": 1,
-            "marker": "number",
+            "marker": "integer",
             "range": {
               "end": 1,
               "start": 0
@@ -307,12 +325,18 @@
     "objects": {
       "nameToUUID": {
         "gdefaults": "gdefaults2",
-        "numbers": "numbers1"
+        "numbers": "numbers1",
+        "sdefaults": "sdefaults2",
+        "tokenize": "tokenize2"
       },
       "namespaced": {
         "gdefaults2": {
         },
         "numbers1": {
+        },
+        "sdefaults2": {
+        },
+        "tokenize2": {
         }
       },
       "processed": [
@@ -395,12 +419,18 @@
     "objects": {
       "nameToUUID": {
         "gdefaults": "gdefaults2",
-        "numbers": "numbers1"
+        "numbers": "numbers1",
+        "sdefaults": "sdefaults2",
+        "tokenize": "tokenize2"
       },
       "namespaced": {
         "gdefaults2": {
         },
         "numbers1": {
+        },
+        "sdefaults2": {
+        },
+        "tokenize2": {
         }
       },
       "processed": [
@@ -446,6 +476,8 @@
     },
     "contexts": [
       {
+        "dead": true,
+        "level": 1,
         "marker": "unknown",
         "range": {
           "end": 1,
@@ -453,6 +485,7 @@
         },
         "text": "c1",
         "topLevel": true,
+        "unknown": true,
         "value": "c1",
         "word": "c1"
       }
@@ -462,22 +495,43 @@
     ],
     "metadata": {
       "opChoices": [
+        {
+          "counter": 1,
+          "op": [
+            "unknown",
+            0
+          ],
+          "ops": [
+            [
+              "unknown",
+              0
+            ]
+          ]
+        }
       ]
     },
     "objects": {
       "nameToUUID": {
         "gdefaults": "gdefaults2",
-        "numbers": "numbers1"
+        "numbers": "numbers1",
+        "sdefaults": "sdefaults2",
+        "tokenize": "tokenize2"
       },
       "namespaced": {
         "gdefaults2": {
         },
         "numbers1": {
+        },
+        "sdefaults2": {
+        },
+        "tokenize2": {
         }
       },
       "processed": [
         {
           "context": {
+            "dead": true,
+            "level": 1,
             "marker": "unknown",
             "range": {
               "end": 1,
@@ -485,6 +539,7 @@
             },
             "text": "c1",
             "topLevel": true,
+            "unknown": true,
             "value": "c1",
             "word": "c1"
           },

package/common/ordering.instance.json

@@ -288,7 +288,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [
@@ -639,7 +639,8 @@
                 "end": 37
               },
               "types": [
-                "list"
+                "list",
+                "queryable"
               ],
               "listable": true,
               "isList": true,
@@ -654,6 +655,10 @@
                     "start": 21,
                     "end": 26
                   },
+                  "types": [
+                    "queryable",
+                    "unknown"
+                  ],
                   "dead": true,
                   "level": 1
                 },
@@ -667,6 +672,10 @@
                     "start": 32,
                     "end": 37
                   },
+                  "types": [
+                    "queryable",
+                    "unknown"
+                  ],
                   "dead": true,
                   "level": 1
                 }
@@ -1120,7 +1129,7 @@
         ],
         [
           "theAble",
-          "theAble",
+          "queryable",
           false
         ],
         [

package/common/ordinals.js

@@ -31,6 +31,7 @@ let 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 }" }],

package/common/ordinals.test.json

@@ -302,5 +302,111 @@
     "responses": [
       ""
     ]
+  },
+  {
+    "associations": [
+    ],
+    "config": {
+    },
+    "contexts": [
+      {
+        "dead": true,
+        "instance": true,
+        "level": 1,
+        "marker": "ordinal",
+        "ordinal": true,
+        "range": {
+          "end": 3,
+          "start": 0
+        },
+        "text": "last",
+        "topLevel": true,
+        "value": -1,
+        "word": "last"
+      }
+    ],
+    "developerTest": false,
+    "generatedParenthesized": [
+      ""
+    ],
+    "metadata": {
+      "opChoices": [
+        {
+          "counter": 1,
+          "op": [
+            "ordinal",
+            0
+          ],
+          "ops": [
+            [
+              "ordinal",
+              0
+            ]
+          ]
+        }
+      ]
+    },
+    "objects": {
+      "nameToUUID": {
+        "gdefaults": "gdefaults2",
+        "numbers": "numbers2",
+        "ordinals": "ordinals1",
+        "pos": "pos2",
+        "punctuation": "punctuation2",
+        "sdefaults": "sdefaults2",
+        "tokenize": "tokenize2"
+      },
+      "namespaced": {
+        "gdefaults2": {
+        },
+        "numbers2": {
+        },
+        "ordinals1": {
+        },
+        "pos2": {
+        },
+        "punctuation2": {
+        },
+        "sdefaults2": {
+        },
+        "tokenize2": {
+        }
+      },
+      "processed": [
+        {
+          "context": {
+            "dead": true,
+            "instance": true,
+            "level": 1,
+            "marker": "ordinal",
+            "ordinal": true,
+            "range": {
+              "end": 3,
+              "start": 0
+            },
+            "text": "last",
+            "topLevel": true,
+            "value": -1,
+            "word": "last"
+          },
+          "generatedParenthesized": "",
+          "paraphrases": "last",
+          "paraphrasesParenthesized": "(last)",
+          "responses": [
+            ""
+          ]
+        }
+      ]
+    },
+    "paraphrases": [
+      "last"
+    ],
+    "paraphrasesParenthesized": [
+      "(last)"
+    ],
+    "query": "last",
+    "responses": [
+      ""
+    ]
   }
 ]