tpmkms_4wp 9.8.0-beta.16 → 9.8.0-beta.17

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 (18) hide show
  1. package/common/dimension.instance.json +138 -14
  2. package/common/dimension.js +5 -1
  3. package/common/drone.instance.json +28 -28
  4. package/common/drone.js +0 -18
  5. package/common/drone_v1.js +5 -5
  6. package/common/fastfood.js +6 -6
  7. package/common/formulas.instance.json +134 -8
  8. package/common/formulas.js +11 -2
  9. package/common/helpers.js +0 -1
  10. package/common/hierarchy.js +4 -1
  11. package/common/math.instance.json +128 -0
  12. package/common/math.js +5 -2
  13. package/common/nameable.js +3 -1
  14. package/common/reminders.js +13 -13
  15. package/common/reports.instance.json +2 -2
  16. package/common/time.instance.json +39 -9
  17. package/common/time.js +2 -1
  18. package/package.json +2 -2
package/common/dimension.instance.json CHANGED
@@ -92,23 +92,53 @@
92
92
  "verb"
93
93
  ],
94
94
  "bridge": "{ ...next(operator), quantity: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'quantity' }] }",
95
+ "check": [
96
+ "marker",
97
+ "text",
98
+ "verbatim",
99
+ "value",
100
+ "evalue",
101
+ "isResponse",
102
+ {
103
+ "properties": "modifiers"
104
+ },
105
+ {
106
+ "properties": "postModifiers"
107
+ },
108
+ "quantity"
109
+ ],
95
110
  "semantic": "async ({context, e, api, toArray, resolveEvaluate}) => {\n const preferredUnits = await api.getPreferredUnits(context.quantity)\n if (!preferredUnits) {\n return\n }\n const from = context.quantity;\n const value = await e({ marker: 'convertToUnits', from, to: preferredUnits }, where())\n resolveEvaluate(context, value.evalue)\n }"
96
111
  },
97
112
  {
98
- "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:216",
113
+ "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:217",
99
114
  "id": "useUnits",
100
115
  "isA": [
101
116
  "verb"
102
117
  ],
103
118
  "bridge": "{ ...next(operator), units: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'units' }] }",
119
+ "check": [
120
+ "marker",
121
+ "text",
122
+ "verbatim",
123
+ "value",
124
+ "evalue",
125
+ "isResponse",
126
+ {
127
+ "properties": "modifiers"
128
+ },
129
+ {
130
+ "properties": "postModifiers"
131
+ },
132
+ "units"
133
+ ],
104
134
  "semantic": "({context, api}) => {\n api.setPreferredUnits(context.units)\n }"
105
135
  },
106
136
  {
107
- "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:225",
137
+ "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:227",
108
138
  "id": "dimension"
109
139
  },
110
140
  {
111
- "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:229",
141
+ "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:231",
112
142
  "id": "quantity",
113
143
  "isA": [
114
144
  "noun"
@@ -150,12 +180,44 @@
150
180
  "after": [
151
181
  "mathematical_operator"
152
182
  ],
153
- "bridge": "{ \n marker: next(operator('quantity')), \n dead: true, \n instance: true,\n unit: after[0], \n amount: before[0], \n interpolate: [ { property: 'amount' }, { property: 'unit' } ] \n }"
183
+ "bridge": "{ \n marker: next(operator('quantity')), \n dead: true, \n instance: true,\n unit: after[0], \n amount: before[0], \n interpolate: [ { property: 'amount' }, { property: 'unit' } ] \n }",
184
+ "check": [
185
+ "marker",
186
+ "text",
187
+ "verbatim",
188
+ "value",
189
+ "evalue",
190
+ "isResponse",
191
+ {
192
+ "properties": "modifiers"
193
+ },
194
+ {
195
+ "properties": "postModifiers"
196
+ },
197
+ "unit",
198
+ "amount"
199
+ ]
154
200
  },
155
201
  {
156
- "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:267",
202
+ "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:270",
157
203
  "id": "convertToUnits",
158
204
  "bridge": "{ ...next(operator), from: before[0], to: after[0] }",
205
+ "check": [
206
+ "marker",
207
+ "text",
208
+ "verbatim",
209
+ "value",
210
+ "evalue",
211
+ "isResponse",
212
+ {
213
+ "properties": "modifiers"
214
+ },
215
+ {
216
+ "properties": "postModifiers"
217
+ },
218
+ "from",
219
+ "to"
220
+ ],
159
221
  "isA": [
160
222
  "expression",
161
223
  "queryable"
@@ -197,7 +259,7 @@
197
259
  "bridges": [
198
260
  {
199
261
  "id": "useMeasurementSystem",
200
- "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:324",
262
+ "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:328",
201
263
  "isA": [
202
264
  "verb"
203
265
  ],
@@ -4932,22 +4994,52 @@
4932
4994
  "isA": [
4933
4995
  "verb"
4934
4996
  ],
4935
- "bridge": "{ ...next(operator), quantity: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'quantity' }] }"
4997
+ "bridge": "{ ...next(operator), quantity: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'quantity' }] }",
4998
+ "check": [
4999
+ "marker",
5000
+ "text",
5001
+ "verbatim",
5002
+ "value",
5003
+ "evalue",
5004
+ "isResponse",
5005
+ {
5006
+ "properties": "modifiers"
5007
+ },
5008
+ {
5009
+ "properties": "postModifiers"
5010
+ },
5011
+ "quantity"
5012
+ ]
4936
5013
  },
4937
5014
  {
4938
- "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:216",
5015
+ "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:217",
4939
5016
  "id": "useUnits",
4940
5017
  "isA": [
4941
5018
  "verb"
4942
5019
  ],
4943
- "bridge": "{ ...next(operator), units: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'units' }] }"
5020
+ "bridge": "{ ...next(operator), units: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'units' }] }",
5021
+ "check": [
5022
+ "marker",
5023
+ "text",
5024
+ "verbatim",
5025
+ "value",
5026
+ "evalue",
5027
+ "isResponse",
5028
+ {
5029
+ "properties": "modifiers"
5030
+ },
5031
+ {
5032
+ "properties": "postModifiers"
5033
+ },
5034
+ "units"
5035
+ ]
4944
5036
  },
4945
5037
  {
4946
- "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:225",
5038
+ "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:227",
4947
5039
  "id": "dimension"
4948
5040
  },
4949
5041
  {
4950
- "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:229",
5042
+ "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:231",
4951
5043
  "id": "quantity",
4952
5044
  "isA": [
4953
5045
  "noun"
@@ -4993,12 +5085,44 @@
4993
5085
  "after": [
4994
5086
  "mathematical_operator"
4995
5087
  ],
4996
- "bridge": "{ \n marker: next(operator('quantity')), \n dead: true, \n instance: true,\n unit: after[0], \n amount: before[0], \n interpolate: [ { property: 'amount' }, { property: 'unit' } ] \n }"
5088
+ "bridge": "{ \n marker: next(operator('quantity')), \n dead: true, \n instance: true,\n unit: after[0], \n amount: before[0], \n interpolate: [ { property: 'amount' }, { property: 'unit' } ] \n }",
5089
+ "check": [
5090
+ "marker",
5091
+ "text",
5092
+ "verbatim",
5093
+ "value",
5094
+ "evalue",
5095
+ "isResponse",
5096
+ {
5097
+ "properties": "modifiers"
5098
+ },
5099
+ {
5100
+ "properties": "postModifiers"
5101
+ },
5102
+ "unit",
5103
+ "amount"
5104
+ ]
4997
5105
  },
4998
5106
  {
4999
- "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:267",
5107
+ "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:270",
5000
5108
  "id": "convertToUnits",
5001
5109
  "bridge": "{ ...next(operator), from: before[0], to: after[0] }",
5110
+ "check": [
5111
+ "marker",
5112
+ "text",
5113
+ "verbatim",
5114
+ "value",
5115
+ "evalue",
5116
+ "isResponse",
5117
+ {
5118
+ "properties": "modifiers"
5119
+ },
5120
+ {
5121
+ "properties": "postModifiers"
5122
+ },
5123
+ "from",
5124
+ "to"
5125
+ ],
5002
5126
  "isA": [
5003
5127
  "expression",
5004
5128
  "queryable"
@@ -5039,7 +5163,7 @@
5039
5163
  "bridges": [
5040
5164
  {
5041
5165
  "id": "useMeasurementSystem",
5042
- "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:324",
5166
+ "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:328",
5043
5167
  "isA": [
5044
5168
  "verb"
5045
5169
  ],
package/common/dimension.js CHANGED
@@ -202,6 +202,7 @@ const config = {
202
202
  id: "preferredUnits",
203
203
  isA: ['verb'],
204
204
  bridge: "{ ...next(operator), quantity: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'quantity' }] }",
205
+ check: defaultContextCheckProperties(['quantity']),
205
206
  semantic: async ({context, e, api, toArray, resolveEvaluate}) => {
206
207
  const preferredUnits = await api.getPreferredUnits(context.quantity)
207
208
  if (!preferredUnits) {
@@ -217,6 +218,7 @@ const config = {
217
218
  id: "useUnits",
218
219
  isA: ['verb'],
219
220
  bridge: "{ ...next(operator), units: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'units' }] }",
221
+ check: defaultContextCheckProperties(['units']),
220
222
  semantic: ({context, api}) => {
221
223
  api.setPreferredUnits(context.units)
222
224
  }
@@ -261,12 +263,14 @@ const config = {
261
263
  unit: after[0],
262
264
  amount: before[0],
263
265
  interpolate: [ { property: 'amount' }, { property: 'unit' } ]
264
- }`
266
+ }`,
267
+ check: defaultContextCheckProperties(['unit', 'amount']),
265
268
  },
266
269
  {
267
270
  where: where(),
268
271
  id: "convertToUnits",
269
272
  bridge: "{ ...next(operator), from: before[0], to: after[0] }",
273
+ check: defaultContextCheckProperties(['from', 'to']),
270
274
  isA: ['expression', 'queryable'],
271
275
  localHierarchy: [['unknown', 'dimension']],
272
276
  after: [['possession', 0], ['possession', 1]],
package/common/drone.instance.json CHANGED
@@ -290,7 +290,7 @@
290
290
  },
291
291
  {
292
292
  "id": "lift",
293
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1086",
293
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1068",
294
294
  "isA": [
295
295
  "verb"
296
296
  ],
@@ -314,7 +314,7 @@
314
314
  },
315
315
  {
316
316
  "id": "lower",
317
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1098",
317
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1080",
318
318
  "isA": [
319
319
  "verb"
320
320
  ],
@@ -338,7 +338,7 @@
338
338
  },
339
339
  {
340
340
  "id": "openDrone",
341
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1110",
341
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1092",
342
342
  "isA": [
343
343
  "verb"
344
344
  ],
@@ -362,7 +362,7 @@
362
362
  },
363
363
  {
364
364
  "id": "close",
365
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1122",
365
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1104",
366
366
  "isA": [
367
367
  "verb"
368
368
  ],
@@ -386,7 +386,7 @@
386
386
  },
387
387
  {
388
388
  "id": "back",
389
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1134",
389
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1116",
390
390
  "isA": [
391
391
  "noun"
392
392
  ],
@@ -400,7 +400,7 @@
400
400
  },
401
401
  {
402
402
  "id": "toPoint",
403
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1146",
403
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1128",
404
404
  "isA": [
405
405
  "preposition"
406
406
  ],
@@ -430,7 +430,7 @@
430
430
  },
431
431
  {
432
432
  "id": "go",
433
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1159",
433
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1141",
434
434
  "level": 0,
435
435
  "isA": [
436
436
  "verb",
@@ -590,7 +590,7 @@
590
590
  },
591
591
  {
592
592
  "id": "turn",
593
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1213",
593
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1195",
594
594
  "isA": [
595
595
  "verb",
596
596
  "action",
@@ -630,7 +630,7 @@
630
630
  },
631
631
  {
632
632
  "id": "pause",
633
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1272",
633
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1254",
634
634
  "isA": [
635
635
  "verb"
636
636
  ],
@@ -811,7 +811,7 @@
811
811
  },
812
812
  {
813
813
  "id": "stop",
814
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1317",
814
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1299",
815
815
  "isA": [
816
816
  "verb"
817
817
  ],
@@ -10265,7 +10265,7 @@
10265
10265
  },
10266
10266
  {
10267
10267
  "id": "lift",
10268
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1086",
10268
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1068",
10269
10269
  "isA": [
10270
10270
  "verb"
10271
10271
  ],
@@ -10288,7 +10288,7 @@
10288
10288
  },
10289
10289
  {
10290
10290
  "id": "lower",
10291
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1098",
10291
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1080",
10292
10292
  "isA": [
10293
10293
  "verb"
10294
10294
  ],
@@ -10311,7 +10311,7 @@
10311
10311
  },
10312
10312
  {
10313
10313
  "id": "openDrone",
10314
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1110",
10314
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1092",
10315
10315
  "isA": [
10316
10316
  "verb"
10317
10317
  ],
@@ -10334,7 +10334,7 @@
10334
10334
  },
10335
10335
  {
10336
10336
  "id": "close",
10337
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1122",
10337
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1104",
10338
10338
  "isA": [
10339
10339
  "verb"
10340
10340
  ],
@@ -10357,7 +10357,7 @@
10357
10357
  },
10358
10358
  {
10359
10359
  "id": "back",
10360
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1134",
10360
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1116",
10361
10361
  "isA": [
10362
10362
  "noun"
10363
10363
  ]
@@ -10370,7 +10370,7 @@
10370
10370
  },
10371
10371
  {
10372
10372
  "id": "toPoint",
10373
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1146",
10373
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1128",
10374
10374
  "isA": [
10375
10375
  "preposition"
10376
10376
  ],
@@ -10399,7 +10399,7 @@
10399
10399
  },
10400
10400
  {
10401
10401
  "id": "go",
10402
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1159",
10402
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1141",
10403
10403
  "level": 0,
10404
10404
  "isA": [
10405
10405
  "verb",
@@ -10558,7 +10558,7 @@
10558
10558
  },
10559
10559
  {
10560
10560
  "id": "turn",
10561
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1213",
10561
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1195",
10562
10562
  "isA": [
10563
10563
  "verb",
10564
10564
  "action",
@@ -10597,7 +10597,7 @@
10597
10597
  },
10598
10598
  {
10599
10599
  "id": "pause",
10600
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1272",
10600
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1254",
10601
10601
  "isA": [
10602
10602
  "verb"
10603
10603
  ],
@@ -10777,7 +10777,7 @@
10777
10777
  },
10778
10778
  {
10779
10779
  "id": "stop",
10780
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1317",
10780
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1299",
10781
10781
  "isA": [
10782
10782
  "verb"
10783
10783
  ],
@@ -10793,29 +10793,29 @@
10793
10793
  ],
10794
10794
  "semantics": [
10795
10795
  {
10796
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1341"
10796
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1323"
10797
10797
  },
10798
10798
  {
10799
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1350"
10799
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1332"
10800
10800
  },
10801
10801
  {
10802
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1377"
10802
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1359"
10803
10803
  },
10804
10804
  {
10805
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1412"
10805
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1394"
10806
10806
  },
10807
10807
  {},
10808
10808
  {
10809
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1449"
10809
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1431"
10810
10810
  },
10811
10811
  {
10812
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1483"
10812
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1465"
10813
10813
  },
10814
10814
  {
10815
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1509"
10815
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1491"
10816
10816
  },
10817
10817
  {
10818
- "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1516"
10818
+ "where": "/home/dev/code/theprogrammablemind/kms/common/drone.js:1498"
10819
10819
  }
10820
10820
  ]
10821
10821
  }
package/common/drone.js CHANGED
@@ -1063,24 +1063,6 @@ const template = {
1063
1063
  objects.runCommand = true
1064
1064
  }
1065
1065
  },
1066
- /*
1067
- {
1068
- id: 'do',
1069
- where: where(),
1070
- isA: ['verb'],
1071
- bridge: `{
1072
- ...next(operator), operator: operator, path: after[0], interpolate: [{ property: 'operator'}, { property: 'path' }]
1073
- }`,
1074
- semantic: async ({context, e, toEValue, objects}) => {
1075
- const evaluated = await(e(context.path))
1076
- const path = toEValue(evaluated)
1077
- for (const point of path.points) {
1078
- objects.current.path.push(point)
1079
- }
1080
- objects.runCommand = true
1081
- }
1082
- },
1083
- */
1084
1066
  {
1085
1067
  id: 'lift',
1086
1068
  where: where(),
package/common/drone_v1.js CHANGED
@@ -593,11 +593,11 @@ knowledgeModule( {
593
593
  ],
594
594
  objects: [
595
595
  { km: 'stm' },
596
- { path: ['isCalibrated'] },
597
- { path: ['calibration'] },
598
- { path: ['history'] },
599
- { path: ['current'] },
600
- { path: ['runCommand'] },
596
+ 'isCalibrated',
597
+ { property: 'calibration', all: true },
598
+ { property: 'current', all: true },
599
+ { property: 'history', all: true },
600
+ 'runCommand',
601
601
  ],
602
602
  }
603
603
  },
package/common/fastfood.js CHANGED
@@ -1005,11 +1005,11 @@ knowledgeModule( {
1005
1005
  checks: {
1006
1006
  objects: [
1007
1007
  'show',
1008
- { path: ['items'] },
1009
- /*
1010
1008
  {
1011
1009
  property: 'items',
1012
- check: [
1010
+ check: [{
1011
+ property: (key) => typeof key == 'number',
1012
+ check: [
1013
1013
  'combo',
1014
1014
  'pieces',
1015
1015
  'size',
@@ -1017,10 +1017,10 @@ knowledgeModule( {
1017
1017
  'id',
1018
1018
  { property: 'food', check: [ 'marker', 'value', 'text' ] },
1019
1019
  { property: 'modifications', check: [ 'id', 'item_id', 'food' ] },
1020
- 'needsDrink'
1021
- ],
1020
+ 'needsDrink',
1021
+ ]
1022
+ }],
1022
1023
  },
1023
- */
1024
1024
  'changes',
1025
1025
  'response',
1026
1026
  { property: 'notAvailable', check: [ 'marker', 'value', 'text' ] },