ekms 7.12.8-beta.5 → 7.12.8-beta.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (57) hide show
  1. package/common/animals.instance.json +67 -227
  2. package/common/animals.js +1 -1
  3. package/common/avatar.js +7 -5
  4. package/common/characters.js +7 -5
  5. package/common/crew.instance.json +257 -417
  6. package/common/crew.js +1 -1
  7. package/common/currency.js +0 -2
  8. package/common/dialogues.js +13 -11
  9. package/common/dimension.instance.json +10 -10
  10. package/common/dimension.js +1 -1
  11. package/common/edible.instance.json +139 -255
  12. package/common/edible.js +1 -1
  13. package/common/emotions.instance.json +56 -32
  14. package/common/emotions.js +1 -1
  15. package/common/fastfood.instance.json +915 -1919
  16. package/common/fastfood.js +1 -1
  17. package/common/formulas.instance.json +7 -7
  18. package/common/formulas.js +2 -2
  19. package/common/help.js +4 -2
  20. package/common/helpers.js +5 -0
  21. package/common/javascript.js +8 -6
  22. package/common/kirk.instance.json +1 -1
  23. package/common/kirk.js +1 -1
  24. package/common/length.instance.json +37 -217
  25. package/common/length.js +1 -1
  26. package/common/math.instance.json +19 -39
  27. package/common/math.js +1 -1
  28. package/common/meta.instance.json +1 -1
  29. package/common/meta.js +29 -10
  30. package/common/numbers.js +31 -24
  31. package/common/ordering.instance.json +86 -82
  32. package/common/ordering.js +1 -1
  33. package/common/people.instance.json +42 -70
  34. package/common/people.js +1 -1
  35. package/common/pipboy.instance.json +109 -169
  36. package/common/pipboy.js +1 -1
  37. package/common/pokemon.instance.json +31 -87
  38. package/common/pokemon.js +1 -1
  39. package/common/pressure.instance.json +10 -30
  40. package/common/pressure.js +1 -1
  41. package/common/properties.instance.json +16 -44
  42. package/common/properties.js +13 -8
  43. package/common/reports.instance.json +6 -62
  44. package/common/reports.js +9 -7
  45. package/common/scorekeeper.instance.json +1 -1
  46. package/common/scorekeeper.js +9 -7
  47. package/common/spock.instance.json +1 -1
  48. package/common/spock.js +1 -1
  49. package/common/tell.js +4 -2
  50. package/common/temperature.instance.json +13 -129
  51. package/common/temperature.js +1 -1
  52. package/common/time.js +36 -20
  53. package/common/time.test.json +66 -44
  54. package/common/ui.instance.json +1 -1
  55. package/common/weight.instance.json +25 -193
  56. package/common/weight.js +1 -1
  57. package/package.json +2 -2
@@ -35,7 +35,7 @@ const fastfood_instance = require('./fastfood.instance.json')
35
35
  */
36
36
 
37
37
  const template = {
38
- "queries": [
38
+ configs: [
39
39
  "food is countable",
40
40
  "drinks are countable",
41
41
  "bacon modifies deluxe",
@@ -1,5 +1,5 @@
1
1
  {
2
- "queries": [
2
+ "configs": [
3
3
  "formulas are concepts",
4
4
  {
5
5
  "name": "formulas",
@@ -757,13 +757,13 @@
757
757
  "one": {
758
758
  "number": "many",
759
759
  "marker": "unknown",
760
+ "value": "formulas",
761
+ "word": "formulas",
762
+ "text": "formulas",
760
763
  "range": {
761
764
  "start": 0,
762
765
  "end": 20
763
766
  },
764
- "word": "formulas",
765
- "text": "formulas",
766
- "value": "formulas",
767
767
  "unknown": true,
768
768
  "dead": true,
769
769
  "types": [
@@ -773,13 +773,13 @@
773
773
  },
774
774
  "two": {
775
775
  "marker": "unknown",
776
+ "value": "concepts",
777
+ "word": "concepts",
778
+ "text": "concepts",
776
779
  "range": {
777
780
  "start": 13,
778
781
  "end": 20
779
782
  },
780
- "word": "concepts",
781
- "text": "concepts",
782
- "value": "concepts",
783
783
  "unknown": true,
784
784
  "dead": true,
785
785
  "types": [
@@ -12,7 +12,7 @@ const instance = require('./formulas.instance.json')
12
12
 
13
13
  /*
14
14
  const template = {
15
- queries: [
15
+ configs: [
16
16
  // { query: "x equals y + 4", development: true },
17
17
  ]
18
18
  }
@@ -186,7 +186,7 @@ let configStruct = {
186
186
  };
187
187
 
188
188
  const template = {
189
- queries: [
189
+ configs: [
190
190
  "formulas are concepts",
191
191
  configStruct,
192
192
  ]
package/common/help.js CHANGED
@@ -72,8 +72,10 @@ const configStruct = {
72
72
  debug: false,
73
73
  version: '3',
74
74
  words: {
75
- // "km1": { "the": [{"id": "the", "initial": "{ modifiers: [] }" }],
76
- 'km1': [{id: "km", initial: "{ value: 'km1', word: 'km1' }", development: true }],
75
+ "literals": {
76
+ // "km1": { "the": [{"id": "the", "initial": "{ modifiers: [] }" }],
77
+ 'km1': [{id: "km", initial: "{ value: 'km1', word: 'km1' }", development: true }],
78
+ }
77
79
  },
78
80
  };
79
81
 
package/common/helpers.js CHANGED
@@ -33,6 +33,10 @@ const getCount = (context) => {
33
33
  }
34
34
  }
35
35
 
36
+ const words = (base, additional = {}) => {
37
+ return [{ word: pluralize.singular(base), number: 'one', ...additional }, { word: pluralize.plural(base), number: 'many', ...additional }]
38
+ }
39
+
36
40
  const isMany = (context) => {
37
41
  if (((context || {}).value || {}).marker == 'list' && (((context || {}).value || {}).value || []).length > 1) {
38
42
  return true
@@ -160,6 +164,7 @@ module.exports = {
160
164
  chooseNumber,
161
165
  zip,
162
166
  focus,
167
+ words,
163
168
  propertyToArray,
164
169
  wordNumber,
165
170
  }
@@ -18,12 +18,14 @@ let configStruct = {
18
18
  debug: false,
19
19
  version: '3',
20
20
  words: {
21
- "=": [{"id": "assignment", "initial": "{ value: 1 }" }],
22
- /*
23
- " ([0-9]+)": [{"id": "number", "initial": "{ value: int(group[0]) }" }],
24
- "one": [{"id": "number", "initial": "{ value: 1 }" }],
25
- "ten": [{"id": "number", "initial": "{ value: 10 }" }],
26
- */
21
+ "literals": {
22
+ "=": [{"id": "assignment", "initial": "{ value: 1 }" }],
23
+ /*
24
+ " ([0-9]+)": [{"id": "number", "initial": "{ value: int(group[0]) }" }],
25
+ "one": [{"id": "number", "initial": "{ value: 1 }" }],
26
+ "ten": [{"id": "number", "initial": "{ value: 10 }" }],
27
+ */
28
+ }
27
29
  },
28
30
 
29
31
  hierarchy: [
@@ -1,5 +1,5 @@
1
1
  {
2
- "queries": [
2
+ "configs": [
3
3
  "you are kirk"
4
4
  ],
5
5
  "resultss": [
package/common/kirk.js CHANGED
@@ -5,7 +5,7 @@ const kirk_tests = require('./kirk.test.json')
5
5
  const kirk_instance = require('./kirk.instance.json')
6
6
 
7
7
  const template = {
8
- "queries": [
8
+ configs: [
9
9
  "you are kirk",
10
10
  ]
11
11
  };
@@ -1,5 +1,5 @@
1
1
  {
2
- "queries": [
2
+ "configs": [
3
3
  "length is a dimension",
4
4
  "meter centimeter foot and inch are units of length",
5
5
  "meters = centimeters / 100",
@@ -2074,52 +2074,52 @@
2074
2074
  "value": [
2075
2075
  {
2076
2076
  "marker": "unknown",
2077
+ "value": "meter",
2078
+ "word": "meter",
2079
+ "text": "meter",
2077
2080
  "range": {
2078
2081
  "start": 0,
2079
2082
  "end": 4
2080
2083
  },
2081
- "word": "meter",
2082
- "text": "meter",
2083
- "value": "meter",
2084
2084
  "unknown": true,
2085
2085
  "dead": true,
2086
2086
  "level": 1
2087
2087
  },
2088
2088
  {
2089
2089
  "marker": "unknown",
2090
+ "value": "centimeter",
2091
+ "word": "centimeter",
2092
+ "text": "centimeter",
2090
2093
  "range": {
2091
2094
  "start": 6,
2092
2095
  "end": 15
2093
2096
  },
2094
- "word": "centimeter",
2095
- "text": "centimeter",
2096
- "value": "centimeter",
2097
2097
  "unknown": true,
2098
2098
  "dead": true,
2099
2099
  "level": 1
2100
2100
  },
2101
2101
  {
2102
2102
  "marker": "unknown",
2103
+ "value": "foot",
2104
+ "word": "foot",
2105
+ "text": "foot",
2103
2106
  "range": {
2104
2107
  "start": 17,
2105
2108
  "end": 20
2106
2109
  },
2107
- "word": "foot",
2108
- "text": "foot",
2109
- "value": "foot",
2110
2110
  "unknown": true,
2111
2111
  "dead": true,
2112
2112
  "level": 2
2113
2113
  },
2114
2114
  {
2115
2115
  "marker": "unknown",
2116
+ "value": "inch",
2117
+ "word": "inch",
2118
+ "text": "inch",
2116
2119
  "range": {
2117
2120
  "start": 26,
2118
2121
  "end": 29
2119
2122
  },
2120
- "word": "inch",
2121
- "text": "inch",
2122
- "value": "inch",
2123
2123
  "unknown": true,
2124
2124
  "dead": true,
2125
2125
  "level": 2
@@ -2408,16 +2408,6 @@
2408
2408
  "propertyOf",
2409
2409
  1
2410
2410
  ]
2411
- ],
2412
- [
2413
- [
2414
- "length",
2415
- 0
2416
- ],
2417
- [
2418
- "unknown",
2419
- 0
2420
- ]
2421
2411
  ]
2422
2412
  ],
2423
2413
  "learned_contextual_priorities": [],
@@ -5669,13 +5659,13 @@
5669
5659
  ],
5670
5660
  "x": {
5671
5661
  "marker": "unknown",
5662
+ "value": "millimeters",
5663
+ "word": "millimeters",
5664
+ "text": "millimeters",
5672
5665
  "range": {
5673
5666
  "start": 14,
5674
5667
  "end": 24
5675
5668
  },
5676
- "word": "millimeters",
5677
- "text": "millimeters",
5678
- "value": "millimeters",
5679
5669
  "unknown": true,
5680
5670
  "dead": true,
5681
5671
  "types": [
@@ -5724,16 +5714,6 @@
5724
5714
  ""
5725
5715
  ],
5726
5716
  "associations": [
5727
- [
5728
- [
5729
- "/",
5730
- 0
5731
- ],
5732
- [
5733
- "unknown",
5734
- 0
5735
- ]
5736
- ],
5737
5717
  [
5738
5718
  [
5739
5719
  "centimeter",
@@ -6783,13 +6763,13 @@
6783
6763
  "dead": true,
6784
6764
  "left": {
6785
6765
  "marker": "unknown",
6766
+ "value": "millimeters",
6767
+ "word": "millimeters",
6768
+ "text": "millimeters",
6786
6769
  "range": {
6787
6770
  "start": 0,
6788
6771
  "end": 10
6789
6772
  },
6790
- "word": "millimeters",
6791
- "text": "millimeters",
6792
- "value": "millimeters",
6793
6773
  "unknown": true,
6794
6774
  "dead": true,
6795
6775
  "types": [
@@ -6869,16 +6849,6 @@
6869
6849
  ""
6870
6850
  ],
6871
6851
  "associations": [
6872
- [
6873
- [
6874
- "*",
6875
- 0
6876
- ],
6877
- [
6878
- "unknown",
6879
- 0
6880
- ]
6881
- ],
6882
6852
  [
6883
6853
  [
6884
6854
  "centimeter",
@@ -7938,13 +7908,13 @@
7938
7908
  "dead": true,
7939
7909
  "left": {
7940
7910
  "marker": "unknown",
7911
+ "value": "millimeters",
7912
+ "word": "millimeters",
7913
+ "text": "millimeters",
7941
7914
  "range": {
7942
7915
  "start": 0,
7943
7916
  "end": 10
7944
7917
  },
7945
- "word": "millimeters",
7946
- "text": "millimeters",
7947
- "value": "millimeters",
7948
7918
  "unknown": true,
7949
7919
  "dead": true,
7950
7920
  "types": [
@@ -8024,16 +7994,6 @@
8024
7994
  ""
8025
7995
  ],
8026
7996
  "associations": [
8027
- [
8028
- [
8029
- "*",
8030
- 0
8031
- ],
8032
- [
8033
- "unknown",
8034
- 0
8035
- ]
8036
- ],
8037
7997
  [
8038
7998
  [
8039
7999
  "equals",
@@ -9124,13 +9084,13 @@
9124
9084
  ],
9125
9085
  "x": {
9126
9086
  "marker": "unknown",
9087
+ "value": "millimeters",
9088
+ "word": "millimeters",
9089
+ "text": "millimeters",
9127
9090
  "range": {
9128
9091
  "start": 9,
9129
9092
  "end": 19
9130
9093
  },
9131
- "word": "millimeters",
9132
- "text": "millimeters",
9133
- "value": "millimeters",
9134
9094
  "unknown": true,
9135
9095
  "dead": true,
9136
9096
  "types": [
@@ -9179,16 +9139,6 @@
9179
9139
  ""
9180
9140
  ],
9181
9141
  "associations": [
9182
- [
9183
- [
9184
- "/",
9185
- 0
9186
- ],
9187
- [
9188
- "unknown",
9189
- 0
9190
- ]
9191
- ],
9192
9142
  [
9193
9143
  [
9194
9144
  "divideByOperator",
@@ -13590,13 +13540,13 @@
13590
13540
  "dead": true,
13591
13541
  "left": {
13592
13542
  "marker": "unknown",
13543
+ "value": "miles",
13544
+ "word": "miles",
13545
+ "text": "miles",
13593
13546
  "range": {
13594
13547
  "start": 0,
13595
13548
  "end": 4
13596
13549
  },
13597
- "word": "miles",
13598
- "text": "miles",
13599
- "value": "miles",
13600
13550
  "unknown": true,
13601
13551
  "dead": true,
13602
13552
  "types": [
@@ -13675,16 +13625,6 @@
13675
13625
  ""
13676
13626
  ],
13677
13627
  "associations": [
13678
- [
13679
- [
13680
- "*",
13681
- 0
13682
- ],
13683
- [
13684
- "unknown",
13685
- 0
13686
- ]
13687
- ],
13688
13628
  [
13689
13629
  [
13690
13630
  "equals",
@@ -14761,13 +14701,13 @@
14761
14701
  ],
14762
14702
  "x": {
14763
14703
  "marker": "unknown",
14704
+ "value": "miles",
14705
+ "word": "miles",
14706
+ "text": "miles",
14764
14707
  "range": {
14765
14708
  "start": 7,
14766
14709
  "end": 11
14767
14710
  },
14768
- "word": "miles",
14769
- "text": "miles",
14770
- "value": "miles",
14771
14711
  "unknown": true,
14772
14712
  "dead": true,
14773
14713
  "types": [
@@ -14816,16 +14756,6 @@
14816
14756
  ""
14817
14757
  ],
14818
14758
  "associations": [
14819
- [
14820
- [
14821
- "/",
14822
- 0
14823
- ],
14824
- [
14825
- "unknown",
14826
- 0
14827
- ]
14828
- ],
14829
14759
  [
14830
14760
  [
14831
14761
  "divideByOperator",
@@ -15875,13 +15805,13 @@
15875
15805
  "dead": true,
15876
15806
  "left": {
15877
15807
  "marker": "unknown",
15808
+ "value": "kilometers",
15809
+ "word": "kilometers",
15810
+ "text": "kilometers",
15878
15811
  "range": {
15879
15812
  "start": 0,
15880
15813
  "end": 9
15881
15814
  },
15882
- "word": "kilometers",
15883
- "text": "kilometers",
15884
- "value": "kilometers",
15885
15815
  "unknown": true,
15886
15816
  "dead": true,
15887
15817
  "types": [
@@ -15961,16 +15891,6 @@
15961
15891
  ""
15962
15892
  ],
15963
15893
  "associations": [
15964
- [
15965
- [
15966
- "/",
15967
- 0
15968
- ],
15969
- [
15970
- "unknown",
15971
- 0
15972
- ]
15973
- ],
15974
15894
  [
15975
15895
  [
15976
15896
  "divideByOperator",
@@ -17061,13 +16981,13 @@
17061
16981
  ],
17062
16982
  "x": {
17063
16983
  "marker": "unknown",
16984
+ "value": "kilometers",
16985
+ "word": "kilometers",
16986
+ "text": "kilometers",
17064
16987
  "range": {
17065
16988
  "start": 9,
17066
16989
  "end": 18
17067
16990
  },
17068
- "word": "kilometers",
17069
- "text": "kilometers",
17070
- "value": "kilometers",
17071
16991
  "unknown": true,
17072
16992
  "dead": true,
17073
16993
  "types": [
@@ -17116,16 +17036,6 @@
17116
17036
  ""
17117
17037
  ],
17118
17038
  "associations": [
17119
- [
17120
- [
17121
- "*",
17122
- 0
17123
- ],
17124
- [
17125
- "unknown",
17126
- 0
17127
- ]
17128
- ],
17129
17039
  [
17130
17040
  [
17131
17041
  "equals",
@@ -17213,86 +17123,6 @@
17213
17123
  "fragments": [],
17214
17124
  "semantics": [],
17215
17125
  "associations": [
17216
- [
17217
- [
17218
- "*",
17219
- 0
17220
- ],
17221
- [
17222
- "unknown",
17223
- 0
17224
- ]
17225
- ],
17226
- [
17227
- [
17228
- "*",
17229
- 0
17230
- ],
17231
- [
17232
- "unknown",
17233
- 0
17234
- ]
17235
- ],
17236
- [
17237
- [
17238
- "*",
17239
- 0
17240
- ],
17241
- [
17242
- "unknown",
17243
- 0
17244
- ]
17245
- ],
17246
- [
17247
- [
17248
- "*",
17249
- 0
17250
- ],
17251
- [
17252
- "unknown",
17253
- 0
17254
- ]
17255
- ],
17256
- [
17257
- [
17258
- "/",
17259
- 0
17260
- ],
17261
- [
17262
- "unknown",
17263
- 0
17264
- ]
17265
- ],
17266
- [
17267
- [
17268
- "/",
17269
- 0
17270
- ],
17271
- [
17272
- "unknown",
17273
- 0
17274
- ]
17275
- ],
17276
- [
17277
- [
17278
- "/",
17279
- 0
17280
- ],
17281
- [
17282
- "unknown",
17283
- 0
17284
- ]
17285
- ],
17286
- [
17287
- [
17288
- "/",
17289
- 0
17290
- ],
17291
- [
17292
- "unknown",
17293
- 0
17294
- ]
17295
- ],
17296
17126
  [
17297
17127
  [
17298
17128
  "a",
@@ -18474,16 +18304,6 @@
18474
18304
  "propertyOf",
18475
18305
  1
18476
18306
  ]
18477
- ],
18478
- [
18479
- [
18480
- "length",
18481
- 0
18482
- ],
18483
- [
18484
- "unknown",
18485
- 0
18486
- ]
18487
18307
  ]
18488
18308
  ],
18489
18309
  "learned_contextual_priorities": []
package/common/length.js CHANGED
@@ -5,7 +5,7 @@ const length_tests = require('./length.test.json')
5
5
  const length_instance = require('./length.instance.json')
6
6
 
7
7
  const template = {
8
- "queries": [
8
+ configs: [
9
9
  "length is a dimension",
10
10
  "meter centimeter foot and inch are units of length",
11
11
  "meters = centimeters / 100",