tpmkms_4wp 9.3.0-beta.6 → 9.3.0-beta.60

package/common/sdefaults.js

@@ -66,7 +66,7 @@ knowledgeModule({
     name: './sdefaults.test.json',
     contents: sdefaults_tests,
     checks: {
-      context: defaultContextCheck(),
+      context: [defaultContextCheck()],
     },
   },
 })

package/common/self.js

@@ -43,7 +43,7 @@ knowledgeModule( {
     name: './self.test.json',
     contents: self_tests,
     checks: {
-      context: defaultContextCheck(),
+      context: [defaultContextCheck()],
     },
   }
 })

package/common/sizeable.js

@@ -62,7 +62,7 @@ knowledgeModule({
     name: './sizeable.test.json',
     contents: sizeable_tests,
     checks: {
-            context: [ ...defaultContextCheck(), { property: 'size', filter: ['value'] } ],
-          },
+      context: [defaultContextCheck()],
+    }
   },
 })

package/common/spock.instance.json

@@ -500,11 +500,6 @@
           "theAble",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",

package/common/spock.js

@@ -23,7 +23,7 @@ knowledgeModule( {
           name: './spock.test.json',
           contents: spock_tests,
           checks: {
-            context: defaultContextCheck(),
+            context: [defaultContextCheck()],
           },
         },
   template: {

package/common/stgame.js

@@ -88,7 +88,7 @@ knowledgeModule( {
           name: './stgame.test.json',
           contents: stgame_tests,
           checks: {
-            context: defaultContextCheck(),
+            context: [defaultContextCheck()],
           },
         },
 })

package/common/stm.js

@@ -270,7 +270,7 @@ knowledgeModule( {
     name: './stm.test.json',
     contents: stm_tests,
     checks: {
-            context: [...defaultContextCheck(), 'pullFromContext', 'stm_id'],
+             context: [defaultContextCheck({ extra: ['pullFromContext', 'stm_id'] })],
             objects: [{ property: 'mentioned', filter: helpers.defaultContextCheckProperties }],
           },
   },

package/common/tell.js

@@ -121,7 +121,7 @@ knowledgeModule( {
     name: './tell.test.json',
     contents: tell_tests,
     checks: {
-            context: defaultContextCheck(),
-          },
+      context: [defaultContextCheck({ extra: ['event', 'info', 'target'] })],
+    },
   },
 })

package/common/temperature.instance.json

@@ -243,11 +243,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -1675,11 +1670,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -3919,11 +3909,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -6397,11 +6382,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -7827,6 +7807,48 @@
             0
           ]
         ],
+        [
+          [
+            "celcius",
+            0
+          ],
+          [
+            "divideByOperator",
+            0
+          ],
+          [
+            "equals",
+            0
+          ],
+          [
+            "fahrenheit",
+            0
+          ],
+          [
+            "integer",
+            0
+          ],
+          [
+            "leftParenthesis",
+            0
+          ],
+          [
+            "minusOperator",
+            0
+          ],
+          [
+            "plusOperator",
+            0
+          ],
+          [
+            "rightParenthesis",
+            0
+          ],
+          [
+            "timesOperator",
+            0
+          ]
+        ],
         [
           [
             "celcius",
@@ -9402,6 +9424,48 @@
         0
       ]
     ],
+    [
+      [
+        "celcius",
+        0
+      ],
+      [
+        "divideByOperator",
+        0
+      ],
+      [
+        "equals",
+        0
+      ],
+      [
+        "fahrenheit",
+        0
+      ],
+      [
+        "integer",
+        0
+      ],
+      [
+        "leftParenthesis",
+        0
+      ],
+      [
+        "minusOperator",
+        0
+      ],
+      [
+        "plusOperator",
+        0
+      ],
+      [
+        "rightParenthesis",
+        0
+      ],
+      [
+        "timesOperator",
+        0
+      ]
+    ],
     [
       [
         "celcius",

package/common/temperature.js

@@ -24,8 +24,8 @@ knowledgeModule({
     name: './temperature.test.json',
     contents: temperature_tests,
     checks: {
-            context: defaultContextCheck(),
-          },
+      context: [defaultContextCheck()],
+    },
   },
   template: {
     template,

package/common/tester.js

@@ -1,5 +1,4 @@
 const { knowledgeModule, where } = require('./runtime').theprogrammablemind
-const { defaultContextCheck } = require('./helpers')
 const tester_tests = require('./tester.test.json')
 const ArgumentParser = require('argparse').ArgumentParser
 

package/common/testing.js

@@ -1,5 +1,4 @@
 const { knowledgeModule, where } = require('./runtime').theprogrammablemind
-const { defaultContextCheck } = require('./helpers')
 const testing_tests = require('./testing.test.json')
 const gdefaults = require('./gdefaults')
 

package/common/time.js

@@ -29,6 +29,14 @@ class API {
     context.event = promise
   }
 
+  now() {
+    if (this.args.isProcess || this.args.isTest) {
+      return new Date(2025, 5, 29, 14, 52, 0)
+    } else {
+      return new Date()
+    }
+  }
+
   newDate() {
     return new Date()
   }
@@ -41,8 +49,11 @@ const config = {
   name: 'time',
   operators: [
     "([time])",
+    "([atTime|at] (time))",
     "([use] (([timeUnit]) [timeFormat|format]))",
-    "(([number|]) [ampm|])"
+    // "(([number|]) [ampm|])",
+    "((time) [ampm|])",
+    "([hourMinutes|] (integer) (colon) (integer))",
     //"(([anyConcept]) [equals|is] ([anyConcept]))",
     //"(([what0|what]) [equals] (<the> ([timeConcept])))",
     //"(<whatP|what> ([anyConcept]))",
@@ -53,26 +64,47 @@ const config = {
     // how many hours are in a day
   ],
   bridges: [
-    { "id": "time", "level": 0, "bridge": "{ ...next(operator) }" },
-
-    // { "id": "hourUnits", "level": 0, "bridge": "{ ...next(operator) }" },
-    { "id": "ampm", "level": 0, "bridge": "{ ...next(operator), hour: before[0] }" },
-
-    { "id": "timeFormat", "level": 0, "bridge": "{ ...before[0], ...next(operator) }" },
-    // { "id": "count", "level": 0, "bridge": "{ ...after, count: operator.value }" },
+    {
+      id: 'hourMinutes',
+      isA: ['time'],
+      convolution: true,
+      bridge: "{ ...next(operator), hour: after[0], colon: after[1], minute: after[2], interpolate: '${hour}${colon}${minute}' }",
+    },
+    { 
+      id: "atTime", 
+      words: ['@'],
+      isA: ['preposition'],
+      bridge: "{ ...next(operator), time: after[0], operator: operator,  interpolate: '${operator} ${time}' }" 
+    },
+    { 
+      id: "time", 
+      bridge: "{ ...next(operator) }" 
+    },
     { 
-      "id": "timeUnit", 
-      "level": 0, 
+      id: "ampm", 
+      isA: ['adjective'],
+      localHierarchy: [
+        ['integer', 'time'],
+      ],
+      bridge: "{ ...next(before[0]), marker: if(isA(before[0].marker, 'integer'), operator('time'), before[0].marker), ampm: operator, time: before[0], interpolate: concat(default(before[0].interpolate, '${time}'), ' ${ampm}') }",
+    },
+    { 
+      id: "timeFormat", 
+      bridge: "{ ...before[0], ...next(operator) }" 
+    },
+    { 
+      id: "timeUnit", 
       words: [ 
         ...helpers.words('hour', { initial: "{ units: 'hour' }" }),
         ...helpers.words('minute', { initial: "{ units: 'minute' }" }),
         ...helpers.words('second', { initial: "{ units: 'second' }" }),
       ],
-      "bridge": "{ ...next(operator) }" 
+      bridge: "{ ...next(operator) }" 
     },
-    { "id": "use", "level": 0, 
-            bridge: "{ ...next(operator), format: after[0] }",
-            generatorp: ({g, context}) => `use ${context.format.quantity.value} hour time` 
+    { 
+      id: "use",
+      bridge: "{ ...next(operator), format: after[0] }",
+      generatorp: ({g, context}) => `use ${context.format.quantity.value} hour time` 
     },
   ],
   hierarchy: [
@@ -84,26 +116,21 @@ const config = {
 
   "words": {
     "literals": {
-      // " ([0-9]+)": [{"id": "count", "initial": "{ value: int(group[0]) }" }],
-      // " (1[0-2]|[1-9])": [{"id": "hourUnits", "initial": "{ hour: int(group[0]) }" }],
-      "am": [{"id": "ampm", "initial": "{ ampm: 'am', determined: true }" }],
-      "pm": [{"id": "ampm", "initial": "{ ampm: 'pm', determined: true }" }],
-      //" (1[0-2]|[1-9]) ?pm": [{"id": "count", "initial": "{ hour: int(group[0]), part: 'pm' }" }],
-      //" (1[0-2]|[1-9]) ?am": [{"id": "count", "initial": "{ hour: int(group[0]), part: 'am' }" }],
+      // " ([0-9]+)": [{id: "count", "initial": "{ value: int(group[0]) }" }],
+      // " (1[0-2]|[1-9])": [{id: "hourUnits", "initial": "{ hour: int(group[0]) }" }],
+      "am": [{id: "ampm", "initial": "{ ampm: 'am', determined: true }" }],
+      "pm": [{id: "ampm", "initial": "{ ampm: 'pm', determined: true }" }],
+      //" (1[0-2]|[1-9]) ?pm": [{id: "count", "initial": "{ hour: int(group[0]), part: 'pm' }" }],
+      //" (1[0-2]|[1-9]) ?am": [{id: "count", "initial": "{ hour: int(group[0]), part: 'am' }" }],
       /*
-      " hours?": [{"id": "timeUnit", "initial": "{ units: 'hour' }" }],
-      " minutes?": [{"id": "timeUnit", "initial": "{ units: 'hour' }" }],
-      " seconds?": [{"id": "timeUnit", "initial": "{ units: 'seconds' }" }],
+      " hours?": [{id: "timeUnit", "initial": "{ units: 'hour' }" }],
+      " minutes?": [{id: "timeUnit", "initial": "{ units: 'hour' }" }],
+      " seconds?": [{id: "timeUnit", "initial": "{ units: 'seconds' }" }],
       */
     }
   },
 
   generators: [
-    { 
-      where: where(),
-      match: ({context}) => context.marker == 'ampm' && context.paraphrase, 
-      apply: async ({g, context, gp}) => `${await gp(context.hour)} ${context.ampm}` 
-    },
     { 
       where: where(),
       match: ({context}) => context.marker == 'time' && context.evalue && context.format == 12, 
@@ -194,7 +221,7 @@ knowledgeModule({
     name: './time.test.json',
     contents: time_tests,
     checks: {
-            context: defaultContextCheck(),
-          },
+      context: [defaultContextCheck({ extra: ['one', 'two', 'events', 'time', 'ampm'] })],
+    }
   },
 })