tpmkms_4wp 9.5.1-beta.9 → 9.6.0

package/common/crew.instance.json

@@ -1004,7 +1004,7 @@
             "end": 19
           },
           "dead": true,
-          "modifiers": [
+          "conceptModifiers": [
             {
               "value": "crew",
               "unknown": true,
@@ -30159,7 +30159,7 @@
             ],
             "ops": [
               [
-                "is",
+                "be",
                 0
               ],
               [
@@ -30391,6 +30391,10 @@
             "propertyOf",
             0
           ],
+          [
+            "the",
+            0
+          ],
           [
             "unknown",
             0
@@ -30401,6 +30405,16 @@
             "is",
             0
           ],
+          [
+            "propertyOf",
+            0
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
+        [
           [
             "propertyOf",
             1
@@ -30858,7 +30872,7 @@
                 },
                 {
                   "marker": [
-                    "is",
+                    "be",
                     0
                   ],
                   "range": {
@@ -32461,7 +32475,7 @@
             "end": 24
           },
           "dead": true,
-          "modifiers": [
+          "conceptModifiers": [
             {
               "value": "photon",
               "unknown": true,
@@ -34419,7 +34433,7 @@
             ],
             "ops": [
               [
-                "is",
+                "be",
                 0
               ],
               [
@@ -34724,10 +34738,6 @@
             "is",
             0
           ],
-          [
-            "propertyOf",
-            1
-          ],
           [
             "status",
             0
@@ -34739,8 +34749,8 @@
         ],
         [
           [
-            "is",
-            0
+            "propertyOf",
+            1
           ],
           [
             "status",
@@ -35229,7 +35239,7 @@
                 },
                 {
                   "marker": [
-                    "is",
+                    "be",
                     0
                   ],
                   "range": {
@@ -46404,7 +46414,7 @@
                 0
               ],
               [
-                "is",
+                "be",
                 0
               ],
               [
@@ -46437,7 +46447,7 @@
                 0
               ],
               [
-                "is",
+                "be",
                 0
               ],
               [
@@ -46466,7 +46476,7 @@
                 0
               ],
               [
-                "is",
+                "be",
                 0
               ],
               [
@@ -46508,7 +46518,7 @@
             ],
             "ops": [
               [
-                "is",
+                "be",
                 0
               ],
               [
@@ -46573,6 +46583,7 @@
           "dead": true,
           "from": {
             "value": "arm",
+            "isVerb": true,
             "number": "many",
             "text": "arm the weapon",
             "marker": "arm",
@@ -46609,6 +46620,7 @@
             },
             "operator": {
               "value": "arm",
+              "isVerb": true,
               "number": "one",
               "text": "arm",
               "marker": "arm",
@@ -46619,7 +46631,6 @@
               },
               "evaluateWord": true,
               "imperative": true,
-              "isVerb": true,
               "level": 0
             },
             "unflatten": [
@@ -46822,10 +46833,6 @@
             "arm",
             0
           ],
-          [
-            "is",
-            0
-          ],
           [
             "means",
             0
@@ -46838,6 +46845,10 @@
             "status",
             0
           ],
+          [
+            "the",
+            0
+          ],
           [
             "unknown",
             0
@@ -46845,7 +46856,7 @@
         ],
         [
           [
-            "is",
+            "arm",
             0
           ],
           [
@@ -46876,7 +46887,7 @@
           ],
           [
             "propertyOf",
-            1
+            0
           ],
           [
             "status",
@@ -46914,6 +46925,24 @@
             "means",
             0
           ]
+        ],
+        [
+          [
+            "means",
+            0
+          ],
+          [
+            "propertyOf",
+            1
+          ],
+          [
+            "status",
+            0
+          ],
+          [
+            "unknown",
+            0
+          ]
         ]
       ],
       "summaries": [
@@ -47578,7 +47607,7 @@
                 },
                 {
                   "marker": [
-                    "is",
+                    "be",
                     0
                   ],
                   "range": {
@@ -47673,7 +47702,7 @@
                 },
                 {
                   "marker": [
-                    "is",
+                    "be",
                     0
                   ],
                   "range": {
@@ -47758,7 +47787,7 @@
                 },
                 {
                   "marker": [
-                    "is",
+                    "be",
                     0
                   ],
                   "range": {
@@ -47898,7 +47927,7 @@
                 },
                 {
                   "marker": [
-                    "is",
+                    "be",
                     0
                   ],
                   "range": {
@@ -50022,7 +50051,7 @@
             ],
             "ops": [
               [
-                "is",
+                "be",
                 0
               ],
               [
@@ -50087,6 +50116,7 @@
           "dead": true,
           "from": {
             "value": "disarm",
+            "isVerb": true,
             "number": "many",
             "text": "disarm the weapon",
             "marker": "disarm",
@@ -50123,6 +50153,7 @@
             },
             "operator": {
               "value": "disarm",
+              "isVerb": true,
               "number": "one",
               "text": "disarm",
               "marker": "disarm",
@@ -50133,7 +50164,6 @@
               },
               "evaluateWord": true,
               "imperative": true,
-              "isVerb": true,
               "level": 0
             },
             "unflatten": [
@@ -50438,10 +50468,6 @@
             "means",
             0
           ],
-          [
-            "propertyOf",
-            1
-          ],
           [
             "status",
             0
@@ -50454,28 +50480,28 @@
         [
           [
             "is",
-            0
+            1
           ],
           [
             "means",
             0
-          ],
-          [
-            "status",
-            0
-          ],
-          [
-            "unknown",
-            0
           ]
         ],
         [
           [
-            "is",
+            "means",
+            0
+          ],
+          [
+            "propertyOf",
             1
           ],
           [
-            "means",
+            "status",
+            0
+          ],
+          [
+            "unknown",
             0
           ]
         ]
@@ -51627,7 +51653,7 @@
                 },
                 {
                   "marker": [
-                    "is",
+                    "be",
                     0
                   ],
                   "range": {
@@ -51978,7 +52004,29 @@
         0
       ],
       [
-        "is",
+        "means",
+        0
+      ],
+      [
+        "propertyOf",
+        0
+      ],
+      [
+        "status",
+        0
+      ],
+      [
+        "the",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "arm",
         0
       ],
       [
@@ -52478,50 +52526,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "means",
-        0
-      ],
-      [
-        "propertyOf",
-        1
-      ],
-      [
-        "status",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "means",
-        0
-      ],
-      [
-        "propertyOf",
-        1
-      ],
-      [
-        "status",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "is",
@@ -52876,21 +52880,7 @@
         0
       ],
       [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "propertyOf",
-        1
-      ],
-      [
-        "status",
+        "the",
         0
       ],
       [
@@ -52905,7 +52895,7 @@
       ],
       [
         "propertyOf",
-        1
+        0
       ],
       [
         "unknown",
@@ -53012,6 +53002,42 @@
         0
       ]
     ],
+    [
+      [
+        "means",
+        0
+      ],
+      [
+        "propertyOf",
+        1
+      ],
+      [
+        "status",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "means",
+        0
+      ],
+      [
+        "propertyOf",
+        1
+      ],
+      [
+        "status",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "modifies",
@@ -53031,6 +53057,30 @@
         "unknown",
         0
       ]
+    ],
+    [
+      [
+        "propertyOf",
+        1
+      ],
+      [
+        "status",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "propertyOf",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
     ]
   ],
   "summaries": [
@@ -57910,7 +57960,7 @@
             },
             {
               "marker": [
-                "is",
+                "be",
                 0
               ],
               "range": {
@@ -58600,7 +58650,7 @@
             },
             {
               "marker": [
-                "is",
+                "be",
                 0
               ],
               "range": {
@@ -59945,7 +59995,7 @@
             },
             {
               "marker": [
-                "is",
+                "be",
                 0
               ],
               "range": {
@@ -60040,7 +60090,7 @@
             },
             {
               "marker": [
-                "is",
+                "be",
                 0
               ],
               "range": {
@@ -60125,7 +60175,7 @@
             },
             {
               "marker": [
-                "is",
+                "be",
                 0
               ],
               "range": {
@@ -60265,7 +60315,7 @@
             },
             {
               "marker": [
-                "is",
+                "be",
                 0
               ],
               "range": {
@@ -61540,7 +61590,7 @@
             },
             {
               "marker": [
-                "is",
+                "be",
                 0
               ],
               "range": {

package/common/dateTimeSelectors.instance.json

@@ -68,11 +68,11 @@
       "semantics": [
         {
           "match": "({context, isA}) => context.evaluate && onOrIs('dayAfterDate', context)",
-          "apply": "async ({context, isProcess, isTest, kms, isA, e}) => {\n            try {\n              const now = kms.time.api.now()\n              const date = afterOrIs('dayAfterDate', context)\n              const afterISO = (await e(date.after)).evalue\n              const day_ordinal = date.day.day_ordinal\n              const ordinal = date.day.ordinal.value\n              context.evalue = dateTimeSelectors_helpers.getNthWeekdayAfterDate(afterISO, day_ordinal, ordinal)\n            } catch ( e ) {\n              context.evalue = `Implement instatiate for this type of date. See the dateTimeSelectors KM ${where()}. ${e}`\n            }\n          }"
+          "apply": "async ({context, isProcess, isTest, kms, isA, e}) => {\n            try {\n              const now = kms.time.api.now()\n              const date = afterOrIs('dayAfterDate', context)\n              const afterISO = (await e(date.after)).evalue\n              const day_ordinal = date.day.day_ordinal\n              const ordinal = date.day.ordinal.value\n              context.evalue = dateTimeSelectors_helpers.getNthWeekdayAfterDate(afterISO, day_ordinal, ordinal)\n            } catch ( e ) {\n              context.evalue = `Implement instatiate for this type of date, ${context.marker}. See the dateTimeSelectors KM ${where()}. ${e}`\n            }\n          }"
         },
         {
           "match": "({context, isA}) => context.evaluate && onOrIs('dayOfMonth', context)",
-          "apply": "({context, isProcess, isTest, kms, isA}) => {\n            try {\n              const now = kms.time.api.now()\n              const date = onOrIs('dayOfMonth', context)\n              context.evalue = dateTimeSelectors_helpers.getNthDayOfMonth(removeDatesSuffix(date.day.value), date.day.ordinal.value || 1, removeDatesSuffix(date.month.value), now)\n            } catch ( e ) {\n              context.evalue = `Implement instatiate for this type of date. See the dateTimeSelectors KM ${where()}. ${e}`\n            }\n          }"
+          "apply": "({context, isProcess, isTest, kms, isA}) => {\n            try {\n              const now = kms.time.api.now()\n              const date = onOrIs('dayOfMonth', context)\n              context.evalue = dateTimeSelectors_helpers.getNthDayOfMonth(removeDatesSuffix(date.day.value), date.day.ordinal.value || 1, removeDatesSuffix(date.month.value), now)\n            } catch ( e ) {\n              context.evalue = `Implement instatiate for this type of date, ${context.marker}. See the dateTimeSelectors KM ${where()}. ${e}`\n            }\n          }"
         },
         {
           "match": "({context, isA}) => {\n            if (!context.evaluate) {\n              return false\n            }\n            if (isA(context.marker, 'onDateValue_dates')) {\n              return true\n            }\n            if (isA(context.marker, 'dateTimeSelector')) {\n              return true\n            }\n          }",

package/common/dateTimeSelectors.js

@@ -28,7 +28,7 @@ function instantiate(kms, isA, isProcessOrTest, dateTimeSelector) {
     const now = kms.time.api.now()
     return dateTimeSelectors_helpers.instantiate(isA, now, dateTimeSelector)
   } catch ( e ) {
-    return `Implement instatiate for this type of date. See the dateTimeSelectors KM ${where()}`
+    return `Implement instatiate for this type of date, ${dateTimeSelector.marker}. See the dateTimeSelectors KM ${where()}, ${e}\n${e.stack}`
   }
 }
 
@@ -104,7 +104,7 @@ const template = {
               const ordinal = date.day.ordinal.value
               context.evalue = dateTimeSelectors_helpers.getNthWeekdayAfterDate(afterISO, day_ordinal, ordinal)
             } catch ( e ) {
-              context.evalue = `Implement instatiate for this type of date. See the dateTimeSelectors KM ${where()}. ${e}`
+              context.evalue = `Implement instatiate for this type of date, ${context.marker}. See the dateTimeSelectors KM ${where()}. ${e}`
             }
           },
         },
@@ -116,7 +116,7 @@ const template = {
               const date = onOrIs('dayOfMonth', context)
               context.evalue = dateTimeSelectors_helpers.getNthDayOfMonth(removeDatesSuffix(date.day.value), date.day.ordinal.value || 1, removeDatesSuffix(date.month.value), now)
             } catch ( e ) {
-              context.evalue = `Implement instatiate for this type of date. See the dateTimeSelectors KM ${where()}. ${e}`
+              context.evalue = `Implement instatiate for this type of date, ${context.marker}. See the dateTimeSelectors KM ${where()}. ${e}`
             }
           },
         },