ekms 9.6.3-beta.2 → 9.6.3-beta.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (55) hide show
  1. package/common/actions.instance.json +130 -5
  2. package/common/actions.js +54 -4
  3. package/common/actions.test.json +31359 -322
  4. package/common/angle.instance.json +58 -834
  5. package/common/articles.js +1 -2
  6. package/common/compass.instance.json +3 -18
  7. package/common/concept.js +2 -1
  8. package/common/conjunction.js +11 -17
  9. package/common/dialogues.js +3 -3
  10. package/common/dimension.instance.json +4 -69
  11. package/common/dimension.js +5 -5
  12. package/common/drone.instance.json +14985 -2538
  13. package/common/drone.js +276 -61
  14. package/common/drone.test.json +412474 -28440
  15. package/common/drone_v1.instance.json +324 -44
  16. package/common/drone_v1.js +9 -9
  17. package/common/edible.instance.json +72 -0
  18. package/common/fastfood.instance.json +5 -72
  19. package/common/fastfood.js +1 -1
  20. package/common/formulas.instance.json +0 -5
  21. package/common/formulas.js +1 -1
  22. package/common/gdefaults.js +16 -5
  23. package/common/helpers/conjunction.js +2 -0
  24. package/common/helpers/formulas.js +6 -0
  25. package/common/helpers/properties.js +9 -7
  26. package/common/helpers.js +9 -5
  27. package/common/hierarchy.js +2 -0
  28. package/common/length.instance.json +555 -5686
  29. package/common/math.instance.json +10 -12
  30. package/common/math.js +6 -5
  31. package/common/menus.instance.json +0 -35
  32. package/common/meta.js +1 -1
  33. package/common/nameable.js +7 -9
  34. package/common/ordinals.js +51 -5
  35. package/common/pipboy.instance.json +0 -85
  36. package/common/pipboy.js +1 -1
  37. package/common/pressure.instance.json +28 -370
  38. package/common/properties.js +4 -3
  39. package/common/rates.instance.json +1 -1
  40. package/common/rates.js +3 -3
  41. package/common/reminders.js +1 -1
  42. package/common/reports.instance.json +9 -176
  43. package/common/reports.js +2 -2
  44. package/common/scorekeeper.js +1 -1
  45. package/common/sdefaults.js +40 -5
  46. package/common/stm.js +50 -42
  47. package/common/temperature.instance.json +648 -2303
  48. package/common/time.instance.json +7376 -1965
  49. package/common/time.js +22 -1
  50. package/common/time.test.json +13239 -0
  51. package/common/ui.instance.json +0 -5
  52. package/common/ui.js +1 -1
  53. package/common/weight.instance.json +329 -1834
  54. package/common/wp.instance.json +88 -70
  55. package/package.json +3 -3
package/common/time.js CHANGED
@@ -54,18 +54,21 @@ class API {
54
54
 
55
55
  const template = {
56
56
  configs: [
57
- "years hours minutes and seconds are units of time",
57
+ "years hours minutes milliseconds and seconds are units of time",
58
58
  "hours = minutes / 60",
59
59
  "minutes = hours * 60",
60
60
  "seconds = minutes * 60",
61
61
  "hours = seconds / 3600",
62
62
  "seconds = hours * 3600",
63
+ "milliseconds = seconds * 1000",
64
+ "seconds = milliseconds / 1000",
63
65
  "minutes = seconds / 60",
64
66
  "day = hours / 24",
65
67
  "hours = days * 24",
66
68
  {
67
69
  operators: [
68
70
  "([thenTime|then])",
71
+ "([repeatable])",
69
72
  "(([timePoint]) [ampm|])",
70
73
  "(([integer]) [timeRepeats|] ([timePoint]))",
71
74
  "([atTime|at] (timePoint))",
@@ -74,17 +77,35 @@ const template = {
74
77
  "([hourMinutes|] (integer) (colon) (integer))",
75
78
  ],
76
79
  bridges: [
80
+ {
81
+ id: 'repeatable',
82
+ check: defaultContextCheckProperties(['repeats'])
83
+ },
77
84
  {
78
85
  id: 'thenTime',
79
86
  after: ['verb'],
80
87
  },
81
88
  {
82
89
  id: 'timeRepeats',
90
+ level: 0,
83
91
  before: ['verb'],
84
92
  convolution: true,
85
93
  bridge: "{ ...next(operator), repeats: before[0], time: after[0], interpolate: '${repeats} ${time}' }",
86
94
  check: defaultContextCheckProperties(['time', 'repeats'])
87
95
  },
96
+ {
97
+ id: 'timeRepeats',
98
+ level: 1,
99
+ before: ['verb'],
100
+ bridge: "{ ...repeatable, repeats: operator, checks: append(repeatable.checks, ['repeats']), repeatable: repeatable, interpolate: [{ property: 'repeatable' }, { property: 'repeats', byPosition: true }] }",
101
+ selector: {
102
+ loose: "repeatable",
103
+ arguments: {
104
+ repeatable: "(@<= 'repeatable')",
105
+ },
106
+ },
107
+ check: defaultContextCheckProperties(['time', 'repeats'])
108
+ },
88
109
  {
89
110
  id: 'hourMinutes',
90
111
  isA: ['timePoint'],