ekms 9.6.3 → 9.7.0

package/common/time.js

@@ -43,6 +43,14 @@ class API {
     }
   }
 
+  async sleep(ms) {
+    if (this.args.isProcess || this.args.isTest) {
+      await this.args.testLog(`sleep(${ms})`)
+    } else {
+      await new Promise(r => setTimeout(r, ms));
+    }
+  }
+
   newDate() {
     return new Date()
   }
@@ -54,18 +62,23 @@ class API {
 
 const template = {
   configs: [
-    "years hours minutes and seconds are units of time",
+    "years hours minutes milliseconds and seconds are units of time",
     "hours = minutes / 60",
     "minutes = hours * 60",
     "seconds = minutes * 60",
     "hours = seconds / 3600",
     "seconds = hours * 3600",
+    "milliseconds = minutes * 60 * 1000",
+    "minutes = milliseconds / 1000 / 60",
+    "milliseconds = seconds * 1000",
+    "seconds = milliseconds / 1000",
     "minutes = seconds / 60",
     "day = hours / 24",
     "hours = days * 24",
     {
       operators: [
         "([thenTime|then])",
+        "([repeatable])",
         "(([timePoint]) [ampm|])",
         "(([integer]) [timeRepeats|] ([timePoint]))",
         "([atTime|at] (timePoint))",
@@ -74,17 +87,35 @@ const template = {
         "([hourMinutes|] (integer) (colon) (integer))",
       ],
       bridges: [
+        { 
+          id: 'repeatable',
+          check: defaultContextCheckProperties(['repeats'])
+        },
         { 
           id: 'thenTime',
           after: ['verb'],
         },
         {
           id: 'timeRepeats',
+          level: 0,
           before: ['verb'],
           convolution: true,
-          bridge: "{ ...next(operator), repeats: before[0], time: after[0], interpolate: '${repeats} ${time}' }",
+          bridge: "{ ...next(operator), repeats: before[0], time: after[0], interpolate: [{ property: 'repeats' }, { property: 'time' }] }",
           check: defaultContextCheckProperties(['time', 'repeats'])
         },
+        {
+          id: 'timeRepeats',
+          level: 1,
+          before: ['verb'],
+          bridge: "{ ...repeatable, repeats: operator, checks: append(repeatable.checks, ['repeats']),  repeatable: repeatable, interpolate: [{ property: 'repeatable' }, { property: 'repeats', byPosition: true }] }",
+          selector: {
+            loose: "repeatable",
+            arguments: {
+              repeatable: "(@<= 'repeatable')",
+            },
+          },
+          check: defaultContextCheckProperties(['time', 'repeats']),
+        },
         {
           id: 'hourMinutes',
           isA: ['timePoint'],
@@ -164,6 +195,21 @@ const template = {
       ],
 
       semantics: [
+        {
+          where: where(),
+          priority: -1,
+          match: (args) => args.callOnce(args, ({context}) => context.repeats) && args.context.repeats?.repeats,
+          apply: async ({context, e, s, handlerStack}) => {
+            const v = (await e(context.repeats.repeats)).evalue
+            for (let i = 0; i < v; ++i) {
+              if (context.action) {
+                await s(context.action)
+              } else {
+                await s({ ...context, repeats: undefined })
+              }
+            }
+          }
+        },
         {
           notes: 'evaluate time',
           where: where(),