ekms 8.0.0-beta.59 → 8.0.0-beta.60

Sign up to get free protection for your applications and to get access to all the features.
Files changed (22) hide show
  1. package/common/animals.instance.json +3 -39
  2. package/common/articles.js +1 -1
  3. package/common/colors.instance.json +177 -157
  4. package/common/comparable.instance.json +2 -0
  5. package/common/crew.instance.json +6 -288
  6. package/common/dialogues.js +2 -2
  7. package/common/dimension.instance.json +0 -36
  8. package/common/edible.instance.json +168 -110
  9. package/common/fastfood.instance.json +799 -364
  10. package/common/fastfood.js +1 -1
  11. package/common/fastfood.test.json +268 -90
  12. package/common/length.instance.json +14 -13
  13. package/common/numbers.js +21 -21
  14. package/common/ordering.instance.json +12 -56
  15. package/common/people.instance.json +60 -0
  16. package/common/pipboy.instance.json +2 -36
  17. package/common/pokemon.instance.json +7 -0
  18. package/common/pressure.instance.json +3 -2
  19. package/common/reports.instance.json +2 -2
  20. package/common/temperature.instance.json +8 -7
  21. package/common/weight.instance.json +11 -62
  22. package/package.json +2 -2
package/common/length.instance.json CHANGED
@@ -1116,6 +1116,7 @@
1116
1116
  "dimension"
1117
1117
  ],
1118
1118
  "pullFromContext": false,
1119
+ "instance": true,
1119
1120
  "concept": true,
1120
1121
  "wantsValue": true,
1121
1122
  "determiner": {
@@ -4175,8 +4176,8 @@
4175
4176
  "level": 1
4176
4177
  },
4177
4178
  "y": {
4178
- "value": 100,
4179
4179
  "instance": true,
4180
+ "value": 100,
4180
4181
  "text": "100",
4181
4182
  "marker": "number",
4182
4183
  "word": "100",
@@ -5578,8 +5579,8 @@
5578
5579
  "level": 1
5579
5580
  },
5580
5581
  "y": {
5581
- "value": 100,
5582
5582
  "instance": true,
5583
+ "value": 100,
5583
5584
  "text": "100",
5584
5585
  "marker": "number",
5585
5586
  "word": "100",
@@ -6981,8 +6982,8 @@
6981
6982
  "level": 1
6982
6983
  },
6983
6984
  "y": {
6984
- "value": 10,
6985
6985
  "instance": true,
6986
+ "value": 10,
6986
6987
  "text": "10",
6987
6988
  "marker": "number",
6988
6989
  "word": "10",
@@ -8396,8 +8397,8 @@
8396
8397
  "level": 1
8397
8398
  },
8398
8399
  "y": {
8399
- "value": 10,
8400
8400
  "instance": true,
8401
+ "value": 10,
8401
8402
  "text": "10",
8402
8403
  "marker": "number",
8403
8404
  "word": "10",
@@ -9821,8 +9822,8 @@
9821
9822
  "level": 1
9822
9823
  },
9823
9824
  "y": {
9824
- "value": 1000,
9825
9825
  "instance": true,
9826
+ "value": 1000,
9826
9827
  "text": "1000",
9827
9828
  "marker": "number",
9828
9829
  "word": "1000",
@@ -11246,8 +11247,8 @@
11246
11247
  "level": 1
11247
11248
  },
11248
11249
  "y": {
11249
- "value": 1000,
11250
11250
  "instance": true,
11251
+ "value": 1000,
11251
11252
  "text": "1000",
11252
11253
  "marker": "number",
11253
11254
  "word": "1000",
@@ -12661,8 +12662,8 @@
12661
12662
  "level": 1
12662
12663
  },
12663
12664
  "y": {
12664
- "value": 12,
12665
12665
  "instance": true,
12666
+ "value": 12,
12666
12667
  "text": "12",
12667
12668
  "marker": "number",
12668
12669
  "word": "12",
@@ -14064,8 +14065,8 @@
14064
14065
  "level": 1
14065
14066
  },
14066
14067
  "y": {
14067
- "value": 12,
14068
14068
  "instance": true,
14069
+ "value": 12,
14069
14070
  "text": "12",
14070
14071
  "marker": "number",
14071
14072
  "word": "12",
@@ -15467,8 +15468,8 @@
15467
15468
  "level": 1
15468
15469
  },
15469
15470
  "y": {
15470
- "value": 3.28,
15471
15471
  "instance": true,
15472
+ "value": 3.28,
15472
15473
  "text": "3.28",
15473
15474
  "marker": "number",
15474
15475
  "word": "3.28",
@@ -16836,8 +16837,8 @@
16836
16837
  "timesExpression"
16837
16838
  ],
16838
16839
  "x": {
16839
- "value": 5280,
16840
16840
  "instance": true,
16841
+ "value": 5280,
16841
16842
  "text": "5280",
16842
16843
  "marker": "number",
16843
16844
  "word": "5280",
@@ -18263,8 +18264,8 @@
18263
18264
  "level": 1
18264
18265
  },
18265
18266
  "y": {
18266
- "value": 5280,
18267
18267
  "instance": true,
18268
+ "value": 5280,
18268
18269
  "text": "5280",
18269
18270
  "marker": "number",
18270
18271
  "word": "5280",
@@ -19678,8 +19679,8 @@
19678
19679
  "level": 1
19679
19680
  },
19680
19681
  "y": {
19681
- "value": 1000,
19682
19682
  "instance": true,
19683
+ "value": 1000,
19683
19684
  "text": "1000",
19684
19685
  "marker": "number",
19685
19686
  "word": "1000",
@@ -21103,8 +21104,8 @@
21103
21104
  "level": 1
21104
21105
  },
21105
21106
  "y": {
21106
- "value": 1000,
21107
21107
  "instance": true,
21108
+ "value": 1000,
21108
21109
  "text": "1000",
21109
21110
  "marker": "number",
21110
21111
  "word": "1000",
package/common/numbers.js CHANGED
@@ -16,32 +16,32 @@ let config = {
16
16
  "([number])",
17
17
  ],
18
18
  bridges: [
19
- { "id": "number", "level": 0, "bridge": "{ ...next(operator) }" },
19
+ { "id": "number", "level": 0, "bridge": "{ instance: false, ...next(operator) }" },
20
20
  ],
21
21
  debug: false,
22
22
  version: '3',
23
23
  words: {
24
24
  "literals": {
25
- "one": [{"id": "number", "initial": "{ value: 1, instance:true }" }],
26
- "ones": [{"id": "number", "initial": "{ value: 1, number: 'many', instance:true }" }],
27
- "two": [{"id": "number", "initial": "{ value: 2 , instance:true}" }],
28
- "twos": [{"id": "number", "initial": "{ value: 2 , number: 'many', instance:true}" }],
29
- "three": [{"id": "number", "initial": "{ value: 3, instance:true }" }],
30
- "threes": [{"id": "number", "initial": "{ value: 3, number: 'many', instance:true }" }],
31
- "four": [{"id": "number", "initial": "{ value: 4, instance:true }" }],
32
- "fours": [{"id": "number", "initial": "{ value: 4, number: 'many', instance:true }" }],
33
- "five": [{"id": "number", "initial": "{ value: 5, instance:true }" }],
34
- "fives": [{"id": "number", "initial": "{ value: 5, number: 'many', instance:true }" }],
35
- "six": [{"id": "number", "initial": "{ value: 6, instance:true }" }],
36
- "sixes": [{"id": "number", "initial": "{ value: 6, number: 'many', instance:true }" }],
37
- "seven": [{"id": "number", "initial": "{ value: 7, instance:true }" }],
38
- "sevens": [{"id": "number", "initial": "{ value: 7, number: 'many', instance:true }" }],
39
- "eight": [{"id": "number", "initial": "{ value: 8, instance:true }" }],
40
- "eights": [{"id": "number", "initial": "{ value: 8, number: 'many', instance:true }" }],
41
- "nine": [{"id": "number", "initial": "{ value: 9, instance:true }" }],
42
- "nines": [{"id": "number", "initial": "{ value: 9, number: 'many', instance:true }" }],
43
- "ten": [{"id": "number", "initial": "{ value: 10, instance:true }" }],
44
- "tens": [{"id": "number", "initial": "{ value: 10, number: 'many', instance:true }" }],
25
+ "one": [{"id": "number", "initial": "{ value: 1, instance: true }" }],
26
+ "ones": [{"id": "number", "initial": "{ value: 1, number: 'many', instance: true }" }],
27
+ "two": [{"id": "number", "initial": "{ value: 2 , instance: true}" }],
28
+ "twos": [{"id": "number", "initial": "{ value: 2 , number: 'many', instance: true}" }],
29
+ "three": [{"id": "number", "initial": "{ value: 3, instance: true }" }],
30
+ "threes": [{"id": "number", "initial": "{ value: 3, number: 'many', instance: true }" }],
31
+ "four": [{"id": "number", "initial": "{ value: 4, instance: true }" }],
32
+ "fours": [{"id": "number", "initial": "{ value: 4, number: 'many', instance: true }" }],
33
+ "five": [{"id": "number", "initial": "{ value: 5, instance: true }" }],
34
+ "fives": [{"id": "number", "initial": "{ value: 5, number: 'many', instance: true }" }],
35
+ "six": [{"id": "number", "initial": "{ value: 6, instance: true }" }],
36
+ "sixes": [{"id": "number", "initial": "{ value: 6, number: 'many', instance: true }" }],
37
+ "seven": [{"id": "number", "initial": "{ value: 7, instance: true }" }],
38
+ "sevens": [{"id": "number", "initial": "{ value: 7, number: 'many', instance: true }" }],
39
+ "eight": [{"id": "number", "initial": "{ value: 8, instance: true }" }],
40
+ "eights": [{"id": "number", "initial": "{ value: 8, number: 'many', instance: true }" }],
41
+ "nine": [{"id": "number", "initial": "{ value: 9, instance: true }" }],
42
+ "nines": [{"id": "number", "initial": "{ value: 9, number: 'many', instance: true }" }],
43
+ "ten": [{"id": "number", "initial": "{ value: 10, instance: true }" }],
44
+ "tens": [{"id": "number", "initial": "{ value: 10, number: 'many', instance: true }" }],
45
45
  },
46
46
  patterns: [
47
47
  { "pattern": [{ type: 'digit' }, { repeat: true }], defs: [{id: "number", uuid: '1', initial: "{ value: int(text), instance: true }" }]},
package/common/ordering.instance.json CHANGED
@@ -490,7 +490,7 @@
490
490
  },
491
491
  {
492
492
  "op": [
493
- "xfx",
493
+ "list",
494
494
  0
495
495
  ],
496
496
  "ops": [
@@ -515,7 +515,7 @@
515
515
  },
516
516
  {
517
517
  "op": [
518
- "list",
518
+ "xfx",
519
519
  0
520
520
  ],
521
521
  "ops": [
@@ -524,11 +524,11 @@
524
524
  0
525
525
  ],
526
526
  [
527
- "between",
527
+ "xfx",
528
528
  0
529
529
  ],
530
530
  [
531
- "list",
531
+ "between",
532
532
  0
533
533
  ]
534
534
  ],
@@ -658,7 +658,7 @@
658
658
  "value": "wanter",
659
659
  "unknown": true,
660
660
  "text": "wanter",
661
- "marker": "type",
661
+ "marker": "unknown",
662
662
  "word": "wanter",
663
663
  "range": {
664
664
  "start": 21,
@@ -671,7 +671,7 @@
671
671
  "value": "wantee",
672
672
  "unknown": true,
673
673
  "text": "wantee",
674
- "marker": "type",
674
+ "marker": "unknown",
675
675
  "word": "wantee",
676
676
  "range": {
677
677
  "start": 32,
@@ -748,10 +748,6 @@
748
748
  "unknown",
749
749
  0
750
750
  ],
751
- [
752
- "unknown",
753
- 1
754
- ],
755
751
  [
756
752
  "xfx",
757
753
  0
@@ -772,7 +768,7 @@
772
768
  ],
773
769
  [
774
770
  "unknown",
775
- 0
771
+ 1
776
772
  ],
777
773
  [
778
774
  "xfx",
@@ -790,7 +786,7 @@
790
786
  ],
791
787
  [
792
788
  "list",
793
- 0
789
+ 1
794
790
  ],
795
791
  [
796
792
  "unknown",
@@ -808,7 +804,7 @@
808
804
  ],
809
805
  [
810
806
  "list",
811
- 0
807
+ 1
812
808
  ],
813
809
  [
814
810
  "unknown",
@@ -819,24 +815,6 @@
819
815
  0
820
816
  ]
821
817
  ],
822
- [
823
- [
824
- "between",
825
- 0
826
- ],
827
- [
828
- "is",
829
- 0
830
- ],
831
- [
832
- "list",
833
- 1
834
- ],
835
- [
836
- "unknown",
837
- 1
838
- ]
839
- ],
840
818
  [
841
819
  [
842
820
  "between",
@@ -2303,10 +2281,6 @@
2303
2281
  "unknown",
2304
2282
  0
2305
2283
  ],
2306
- [
2307
- "unknown",
2308
- 1
2309
- ],
2310
2284
  [
2311
2285
  "xfx",
2312
2286
  0
@@ -2327,7 +2301,7 @@
2327
2301
  ],
2328
2302
  [
2329
2303
  "unknown",
2330
- 0
2304
+ 1
2331
2305
  ],
2332
2306
  [
2333
2307
  "xfx",
@@ -2345,7 +2319,7 @@
2345
2319
  ],
2346
2320
  [
2347
2321
  "list",
2348
- 0
2322
+ 1
2349
2323
  ],
2350
2324
  [
2351
2325
  "unknown",
@@ -2363,7 +2337,7 @@
2363
2337
  ],
2364
2338
  [
2365
2339
  "list",
2366
- 0
2340
+ 1
2367
2341
  ],
2368
2342
  [
2369
2343
  "unknown",
@@ -2374,24 +2348,6 @@
2374
2348
  0
2375
2349
  ]
2376
2350
  ],
2377
- [
2378
- [
2379
- "between",
2380
- 0
2381
- ],
2382
- [
2383
- "is",
2384
- 0
2385
- ],
2386
- [
2387
- "list",
2388
- 1
2389
- ],
2390
- [
2391
- "unknown",
2392
- 1
2393
- ]
2394
- ],
2395
2351
  [
2396
2352
  [
2397
2353
  "between",
package/common/people.instance.json CHANGED
@@ -4873,6 +4873,36 @@
4873
4873
  0
4874
4874
  ]
4875
4875
  ],
4876
+ [
4877
+ [
4878
+ "by",
4879
+ 0
4880
+ ],
4881
+ [
4882
+ "isEd",
4883
+ 0
4884
+ ],
4885
+ [
4886
+ "means",
4887
+ 0
4888
+ ],
4889
+ [
4890
+ "owned",
4891
+ 0
4892
+ ],
4893
+ [
4894
+ "ownee",
4895
+ 0
4896
+ ],
4897
+ [
4898
+ "owner",
4899
+ 0
4900
+ ],
4901
+ [
4902
+ "owns",
4903
+ 0
4904
+ ]
4905
+ ],
4876
4906
  [
4877
4907
  [
4878
4908
  "by",
@@ -7134,6 +7164,36 @@
7134
7164
  0
7135
7165
  ]
7136
7166
  ],
7167
+ [
7168
+ [
7169
+ "by",
7170
+ 0
7171
+ ],
7172
+ [
7173
+ "isEd",
7174
+ 0
7175
+ ],
7176
+ [
7177
+ "means",
7178
+ 0
7179
+ ],
7180
+ [
7181
+ "owned",
7182
+ 0
7183
+ ],
7184
+ [
7185
+ "ownee",
7186
+ 0
7187
+ ],
7188
+ [
7189
+ "owner",
7190
+ 0
7191
+ ],
7192
+ [
7193
+ "owns",
7194
+ 0
7195
+ ]
7196
+ ],
7137
7197
  [
7138
7198
  [
7139
7199
  "by",
package/common/pipboy.instance.json CHANGED
@@ -9828,6 +9828,7 @@
9828
9828
  "weapon"
9829
9829
  ],
9830
9830
  "pullFromContext": false,
9831
+ "instance": true,
9831
9832
  "concept": true,
9832
9833
  "wantsValue": true,
9833
9834
  "determiner": {
@@ -12919,6 +12920,7 @@
12919
12920
  "concept"
12920
12921
  ],
12921
12922
  "pullFromContext": false,
12923
+ "instance": true,
12922
12924
  "concept": true,
12923
12925
  "number": "one",
12924
12926
  "wantsValue": true,
@@ -23601,24 +23603,6 @@
23601
23603
  1
23602
23604
  ]
23603
23605
  ],
23604
- [
23605
- [
23606
- "is",
23607
- 0
23608
- ],
23609
- [
23610
- "list",
23611
- 0
23612
- ],
23613
- [
23614
- "unknown",
23615
- 0
23616
- ],
23617
- [
23618
- "unknown",
23619
- 1
23620
- ]
23621
- ],
23622
23606
  [
23623
23607
  [
23624
23608
  "is",
@@ -29815,24 +29799,6 @@
29815
29799
  1
29816
29800
  ]
29817
29801
  ],
29818
- [
29819
- [
29820
- "is",
29821
- 0
29822
- ],
29823
- [
29824
- "list",
29825
- 0
29826
- ],
29827
- [
29828
- "unknown",
29829
- 0
29830
- ],
29831
- [
29832
- "unknown",
29833
- 1
29834
- ]
29835
- ],
29836
29802
  [
29837
29803
  [
29838
29804
  "is",
package/common/pokemon.instance.json CHANGED
@@ -1109,6 +1109,7 @@
1109
1109
  "type"
1110
1110
  ],
1111
1111
  "pullFromContext": false,
1112
+ "instance": true,
1112
1113
  "concept": true,
1113
1114
  "number": "one",
1114
1115
  "wantsValue": true,
@@ -6939,6 +6940,7 @@
6939
6940
  "modifier_pokemon"
6940
6941
  ],
6941
6942
  "pullFromContext": false,
6943
+ "instance": true,
6942
6944
  "concept": true,
6943
6945
  "number": "one",
6944
6946
  "wantsValue": true,
@@ -8212,6 +8214,7 @@
8212
8214
  "modifier_pokemon"
8213
8215
  ],
8214
8216
  "pullFromContext": false,
8217
+ "instance": true,
8215
8218
  "concept": true,
8216
8219
  "number": "one",
8217
8220
  "wantsValue": true,
@@ -9490,6 +9493,7 @@
9490
9493
  "modifier_pokemon"
9491
9494
  ],
9492
9495
  "pullFromContext": false,
9496
+ "instance": true,
9493
9497
  "concept": true,
9494
9498
  "number": "one",
9495
9499
  "wantsValue": true,
@@ -10773,6 +10777,7 @@
10773
10777
  "modifier_pokemon"
10774
10778
  ],
10775
10779
  "pullFromContext": false,
10780
+ "instance": true,
10776
10781
  "concept": true,
10777
10782
  "number": "one",
10778
10783
  "wantsValue": true,
@@ -12036,6 +12041,7 @@
12036
12041
  "modifier_electric"
12037
12042
  ],
12038
12043
  "pullFromContext": false,
12044
+ "instance": true,
12039
12045
  "concept": true,
12040
12046
  "number": "one",
12041
12047
  "wantsValue": true,
@@ -13305,6 +13311,7 @@
13305
13311
  "modifier_fire"
13306
13312
  ],
13307
13313
  "pullFromContext": false,
13314
+ "instance": true,
13308
13315
  "concept": true,
13309
13316
  "number": "one",
13310
13317
  "wantsValue": true,
package/common/pressure.instance.json CHANGED
@@ -1105,6 +1105,7 @@
1105
1105
  "dimension"
1106
1106
  ],
1107
1107
  "pullFromContext": false,
1108
+ "instance": true,
1108
1109
  "concept": true,
1109
1110
  "wantsValue": true,
1110
1111
  "determiner": {
@@ -3986,8 +3987,8 @@
3986
3987
  "level": 1
3987
3988
  },
3988
3989
  "y": {
3989
- "value": 101325,
3990
3990
  "instance": true,
3991
+ "value": 101325,
3991
3992
  "text": "101325",
3992
3993
  "marker": "number",
3993
3994
  "word": "101325",
@@ -5349,8 +5350,8 @@
5349
5350
  "level": 1
5350
5351
  },
5351
5352
  "y": {
5352
- "value": 101325,
5353
5353
  "instance": true,
5354
+ "value": 101325,
5354
5355
  "text": "101325",
5355
5356
  "marker": "number",
5356
5357
  "word": "101325",