tpmkms_4wp 9.5.1-beta.3 → 9.5.1-beta.31

package/common/time.js

@@ -1,17 +1,23 @@
 const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const tell = require('./tell')
-const countable = require('./countable')
-const numbers = require('./numbers')
+const dimension = require('./dimension')
 const helpers = require('./helpers')
 const time_tests = require('./time.test.json')
+const instance = require('./time.instance.json')
 
-const pad = (v, l) => {
+function pad(v, l) {
   const s = String(v)
   const n = l - s.length
   return "0".repeat(n) + s
 }
 
+//"what is the time in 24 hour format"
+//"what time is it in Paris"
+//"what time is it in GMT"
+// what is the time
+// how many hours are in a day
+
 class API {
   // gets the contexts for doing the happening
   semantics({context, args, kms}) {
@@ -45,149 +51,138 @@ class API {
   }
 }
 
-const config = {
-  name: 'time',
-  operators: [
-    "([time])",
-    "([atTime|at] (time))",
-    "([use] (([timeUnit]) [timeFormat|format]))",
-    // "(([number|]) [ampm|])",
-    "((time) [ampm|])",
-    "([hourMinutes|] (integer) (colon) (integer))",
-    //"(([anyConcept]) [equals|is] ([anyConcept]))",
-    //"(([what0|what]) [equals] (<the> ([timeConcept])))",
-    //"(<whatP|what> ([anyConcept]))",
-    //"what is the time in 24 hour format"
-    //"what time is it in Paris"
-    //"what time is it in GMT"
-    // what is the time
-    // how many hours are in a day
-  ],
-  bridges: [
+
+const template = {
+  configs: [
+    "years hours minutes and seconds are units of time",
+    "hours = minutes / 60",
+    "minutes = hours * 60",
+    "seconds = minutes * 60",
+    "hours = seconds / 3600",
+    "seconds = hours * 3600",
+    "minutes = seconds / 60",
+    "day = hours / 24",
+    "hours = days * 24",
     {
-      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: "ampm", 
-      isA: ['adjective'],
-      localHierarchy: [
-        ['integer', 'time'],
+      operators: [
+        "(([timePoint]) [ampm|])",
+        "([atTime|at] (timePoint))",
+        // "([use] (([timeUnit]) [timeFormat|format]))",
+        "([use] (([quantity]) [timeFormat|format]))",
+        "([hourMinutes|] (integer) (colon) (integer))",
       ],
-      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' }" }),
+      bridges: [
+        {
+          id: 'hourMinutes',
+          isA: ['timePoint'],
+          convolution: true,
+          bridge: "{ ...next(operator), hour: after[0], colon: after[1], minute: after[2], interpolate: '${hour}${colon}${minute}' }",
+        },
+        { 
+          id: "timePoint",
+          words: ['time'],
+          isA: ['noun'],
+        },
+        { 
+          id: "atTime", 
+          words: ['@'],
+          isA: ['preposition'],
+          bridge: "{ ...next(operator), time: after[0], operator: operator,  interpolate: '${operator} ${time}' }" 
+        },
+        { 
+          id: "ampm", 
+          isA: ['adjective'],
+          localHierarchy: [
+            ['integer', 'timePoint'],
+          ],
+          bridge: "{ ...next(before[0]), marker: if(isA(before[0].marker, 'integer'), operator('timePoint'), before[0].marker), ampm: operator, time: before[0], interpolate: concat(default(before[0].interpolate, '${time}'), ' ${ampm}') }",
+        },
+        { 
+          id: "timeFormat", 
+          bridge: "{ ...before[0], ...next(operator), interpolate: [ { context: before[0] }, { context: operator } ] }" 
+        },
+        { 
+          id: "use",
+          bridge: "{ ...next(operator), format: after[0], interpolate: [{ context: operator }, { property: 'format' }] }",
+          // generatorp: ({g, context}) => `use ${context.format.quantity.value} hour time` 
+        },
       ],
-      bridge: "{ ...next(operator) }" 
-    },
-    { 
-      id: "use",
-      bridge: "{ ...next(operator), format: after[0] }",
-      generatorp: ({g, context}) => `use ${context.format.quantity.value} hour time` 
-    },
-  ],
-  hierarchy: [
-    ['time', 'queryable'],
-    ['ampm', 'queryable'],
-    ['time', 'theAble'],
-    ['timeUnit', 'countable'],
-  ],
-
-  "words": {
-    "literals": {
-      "am": [{id: "ampm", "initial": "{ ampm: 'am', determined: true }" }],
-      "pm": [{id: "ampm", "initial": "{ ampm: 'pm', determined: true }" }],
-    }
-  },
-
-  generators: [
-    { 
-      where: where(),
-      match: ({context}) => context.marker == 'time' && context.evalue && context.format == 12, 
-      apply: ({context}) => {
-        let hh = context.evalue.getHours();
-        let ampm = 'am'
-        if (hh > 12) {
-          hh -= 12;
-          ampm = 'pm'
-        }
-        let ss = context.evalue.getMinutes()
-        ss = pad(ss, 2)
-        return `${hh}:${ss} ${ampm}` 
-      }
-    },
-    { 
-      where: where(),
-      match: ({context}) => context.marker == 'time' && context.evalue && context.format == 24, 
-      apply: ({g, context}) => {
-        const pad = (num, size) => {
-          num = num.toString();
-          while (num.length < size) num = "0" + num;
-          return num;
+      "words": {
+        "literals": {
+          "am": [{id: "ampm", "initial": "{ ampm: 'am', determined: true }" }],
+          "pm": [{id: "ampm", "initial": "{ ampm: 'pm', determined: true }" }],
         }
+      },
 
-          return `${context.evalue.getHours()}:${pad(context.evalue.getMinutes(), 2)}` 
-      }
-    },
-    { 
-      where: where(),
-      match: ({context}) => context.marker == 'response', 
-      apply: ({g, context}) => context.text 
-    },
-  ],
+      generators: [
+        { 
+          where: where(),
+          match: ({context}) => context.marker == 'timePoint' && context.evalue && context.format == 12, 
+          apply: ({context}) => {
+            let hh = context.evalue.getHours();
+            let ampm = 'am'
+            if (hh > 12) {
+              hh -= 12;
+              ampm = 'pm'
+            }
+            let ss = context.evalue.getMinutes()
+            ss = pad(ss, 2)
+            return `${hh}:${ss} ${ampm}` 
+          }
+        },
+        { 
+          where: where(),
+          match: ({context}) => context.marker == 'timePoint' && context.evalue && context.format == 24, 
+          apply: ({g, context}) => {
+            function pad(num, size) {
+              num = num.toString();
+              while (num.length < size) num = "0" + num;
+              return num;
+            }
 
-  semantics: [
-    {
-      notes: 'evaluate time',
-      where: where(),
-      match: ({objects, context, api}) => context.marker == 'time' && context.evaluate, 
-      apply: ({objects, context, api}) => {
-        context.evalue = api.newDate()
-        context.format = objects.format
-      }
-    },
-    {
-      notes: 'use time format working case',
-      where: where(),
-      match: ({objects, context}) => context.marker == 'use' && context.format && (context.format.quantity.value == 12 || context.format.quantity.value == 24), 
-      apply: ({objects, context}) => {
-        objects.format = context.format.quantity.value
-      }
-    },
-    {
-      notes: 'use time format error case',
-      where: where(),
-      match: ({objects, context}) => context.marker == 'use' && context.format && (context.format.quantity.value != 12 && context.format.quantity.value != 24), 
-      apply: ({objects, context}) => {
-        context.marker = 'response'
-        context.text = 'The hour format is 12 hour or 24 hour'
-      }
-    },
+              return `${context.evalue.getHours()}:${pad(context.evalue.getMinutes(), 2)}` 
+          }
+        },
+        { 
+          where: where(),
+          match: ({context}) => context.marker == 'response', 
+          apply: ({g, context}) => context.text 
+        },
+      ],
+
+      semantics: [
+        {
+          notes: 'evaluate time',
+          where: where(),
+          match: ({objects, context, api}) => context.marker == 'timePoint' && context.evaluate, 
+          apply: ({objects, context, api}) => {
+            context.evalue = api.newDate()
+            context.format = objects.format
+          }
+        },
+        {
+          notes: 'use time format working case',
+          where: where(),
+          match: ({objects, context}) => context.marker == 'use' && context.format && (context.format.amount.value == 12 || context.format.amount.value == 24), 
+          apply: ({objects, context}) => {
+            objects.format = context.format.amount.value
+          }
+        },
+        {
+          notes: 'use time format error case',
+          where: where(),
+          match: ({objects, context}) => context.marker == 'use' && context.format && (context.format.amount.value != 12 && context.format.amount.value != 24), 
+          apply: ({objects, context}) => {
+            context.marker = 'response'
+            context.text = 'The hour format is 12 hour or 24 hour'
+          }
+        },
+      ],
+    }
   ],
-};
+}
 
-const initializer = ({api, config, objects, kms, isModule}) => {
+function initializer({api, config, objects, kms, isModule}) {
   if (!isModule) {
     kms.time.api.newDate = () => new Date("December 25, 1995 1:59:58 pm" )
   }
@@ -201,8 +196,8 @@ const initializer = ({api, config, objects, kms, isModule}) => {
 }
 
 knowledgeModule({
-  config,
-  includes: [tell, numbers, countable],
+  config: { name: 'time' },
+  includes: [tell, dimension],
   api: () => new API(),
   initializer,
 
@@ -212,7 +207,8 @@ knowledgeModule({
     name: './time.test.json',
     contents: time_tests,
     checks: {
-      context: [defaultContextCheck({ extra: ['one', 'two', 'events', 'time', 'ampm'] })],
+      context: [defaultContextCheck({ extra: ['one', 'two', 'events', 'time', 'timePoint', 'ampm'] })],
     }
   },
+  template: { template, instance },
 })