ekms 8.0.0-beta.2 → 8.0.0-beta.21

Sign up to get free protection for your applications and to get access to all the features.
Files changed (84) hide show
  1. package/common/animals.instance.json +2542 -1375
  2. package/common/animals.js +2 -2
  3. package/common/avatar.js +2 -2
  4. package/common/characters.js +12 -16
  5. package/common/colors.instance.json +6646 -3501
  6. package/common/colors.js +2 -2
  7. package/common/colors.test.json +345 -780
  8. package/common/comparable.js +2 -2
  9. package/common/concept.js +8 -6
  10. package/common/countable.js +2 -2
  11. package/common/crew.instance.json +12534 -6597
  12. package/common/crew.js +3 -3
  13. package/common/crew.test.json +714 -452
  14. package/common/currency.js +4 -4
  15. package/common/dialogues.js +5 -21
  16. package/common/dimension.instance.json +242 -261
  17. package/common/dimension.js +4 -4
  18. package/common/dimension.test.json +314 -502
  19. package/common/edible.instance.json +19282 -9954
  20. package/common/edible.js +2 -2
  21. package/common/emotions.instance.json +122 -129
  22. package/common/emotions.js +3 -3
  23. package/common/events.js +3 -3
  24. package/common/fastfood.instance.json +219367 -111011
  25. package/common/fastfood.js +4 -4
  26. package/common/formulas.instance.json +216 -250
  27. package/common/formulas.js +6 -6
  28. package/common/gdefaults.js +2 -2
  29. package/common/help.js +3 -3
  30. package/common/help.test.json +10 -22
  31. package/common/helpers/concept.js +9 -6
  32. package/common/hierarchy.js +3 -3
  33. package/common/javascript.js +3 -3
  34. package/common/kirk.instance.json +564 -290
  35. package/common/kirk.js +2 -2
  36. package/common/length.instance.json +5153 -4677
  37. package/common/length.js +2 -2
  38. package/common/math.instance.json +140 -1157
  39. package/common/math.js +6 -6
  40. package/common/meta.js +3 -3
  41. package/common/negation.instance.json +2 -0
  42. package/common/negation.js +38 -0
  43. package/common/negation.test.json +308 -0
  44. package/common/numbers.js +3 -3
  45. package/common/ordering.instance.json +292 -230
  46. package/common/ordering.js +4 -4
  47. package/common/people.instance.json +1902 -1015
  48. package/common/people.js +3 -3
  49. package/common/percentages.instance.json +2 -0
  50. package/common/percentages.js +57 -0
  51. package/common/percentages.test.json +751 -0
  52. package/common/pipboy.instance.json +7718 -6328
  53. package/common/pipboy.js +4 -4
  54. package/common/pokemon.instance.json +3954 -2081
  55. package/common/pokemon.js +3 -3
  56. package/common/pos.js +1 -1
  57. package/common/pressure.instance.json +1265 -1193
  58. package/common/pressure.js +2 -2
  59. package/common/properties.instance.json +106 -61
  60. package/common/properties.js +6 -4
  61. package/common/punctuation.js +1 -1
  62. package/common/reports.instance.json +557 -559
  63. package/common/reports.js +11 -11
  64. package/common/scorekeeper.js +3 -3
  65. package/common/sdefaults.js +11 -1
  66. package/common/sizeable.js +2 -2
  67. package/common/spock.instance.json +564 -290
  68. package/common/spock.js +2 -2
  69. package/common/stgame.js +13 -9
  70. package/common/stm.js +3 -3
  71. package/common/tell.js +4 -4
  72. package/common/temperature.instance.json +1380 -1208
  73. package/common/temperature.js +2 -2
  74. package/common/tester.js +2 -2
  75. package/common/testing.js +2 -2
  76. package/common/time.js +4 -4
  77. package/common/tokenize.js +1 -1
  78. package/common/ui.instance.json +238 -259
  79. package/common/ui.js +4 -4
  80. package/common/weight.instance.json +4905 -4166
  81. package/common/weight.js +2 -2
  82. package/common/yesno.js +1 -1
  83. package/main.js +51 -46
  84. package/package.json +13 -6
@@ -90,11 +90,11 @@ let configStruct = {
90
90
  ],
91
91
  };
92
92
 
93
- const createConfig = () => {
93
+ const createConfig = async () => {
94
94
  const config = new Config(configStruct, module)
95
95
  config.stop_auto_rebuild()
96
- config.add(numbersKM())
97
- config.api = api
96
+ await config.add(numbersKM)
97
+ await config.setApi(api)
98
98
  config.initializer( ({config, objects, apis, addWord, addGenerator, baseConfig, uuid}) => {
99
99
  // const api = config.km('currency').api
100
100
  // const api = kms.currency.api
@@ -128,7 +128,7 @@ const createConfig = () => {
128
128
  })
129
129
  }
130
130
  })
131
- config.restart_auto_rebuild()
131
+ await config.restart_auto_rebuild()
132
132
  return config
133
133
  }
134
134
 
@@ -3,6 +3,7 @@ const meta = require('./meta.js')
3
3
  const gdefaults = require('./gdefaults.js')
4
4
  const sdefaults = require('./sdefaults.js')
5
5
  const pos = require('./pos.js')
6
+ const negation = require('./negation.js')
6
7
  const punctuation = require('./punctuation.js')
7
8
  const stm = require('./stm.js')
8
9
  const _ = require('lodash')
@@ -59,7 +60,6 @@ let configStruct = {
59
60
  "(<the|> ([theAble|]))",
60
61
  "(<a|a,an> ([theAble|]))",
61
62
  // "([unknown])",
62
- "([not] ([notAble|]))",
63
63
 
64
64
  "([be] ([briefOrWordy|]))",
65
65
 
@@ -172,9 +172,6 @@ let configStruct = {
172
172
  { id: "be", level: 0, bridge: "{ ...next(operator), type: after[0] }" },
173
173
  { id: "briefOrWordy", level: 0, bridge: "{ ...next(operator) }" },
174
174
 
175
- { id: "notAble", level: 0, bridge: "{ ...next(operator) }" },
176
- { id: "not", level: 0, bridge: "{ ...after, negated: true }" },
177
-
178
175
  { id: "yesno", level: 0, bridge: "{ ...next(operator) }" },
179
176
  { id: "canBeQuestion", level: 0, bridge: "{ ...next(operator) }" },
180
177
  { id: "canBeQuestion", level: 1, bridge: "{ ...next(operator) }" },
@@ -337,7 +334,6 @@ let configStruct = {
337
334
  // ['questionMark', 'isEd'],
338
335
  ['a', 'articlePOS'],
339
336
  ['the', 'articlePOS'],
340
- ['unknown', 'notAble'],
341
337
  ['unknown', 'theAble'],
342
338
  ['unknown', 'queryable'],
343
339
  ['it', 'queryable'],
@@ -438,18 +434,6 @@ let configStruct = {
438
434
  }
439
435
  },
440
436
 
441
- {
442
- where: where(),
443
- notes: 'paraphrase a negation',
444
- match: ({context, hierarchy}) => hierarchy.isA(context.marker, 'notAble') && context.negated, // && !context.isQuery && !context.paraphrase && context.value,
445
- apply: ({context, g}) => {
446
- context.negated = false
447
- const result = g(context.value)
448
- context.negated = true
449
- return `not ${result}`
450
- }
451
- },
452
-
453
437
  {
454
438
  where: where(),
455
439
  notes: 'paraphrase a queryable response',
@@ -1018,11 +1002,11 @@ const getAsk = (config) => (uuid) => {
1018
1002
  }
1019
1003
 
1020
1004
 
1021
- const createConfig = () => {
1005
+ const createConfig = async () => {
1022
1006
  const config = new Config(configStruct, module)
1023
1007
  config.stop_auto_rebuild()
1024
- config.api = api
1025
- config.add(gdefaults(), sdefaults(), pos(), stm(), meta(), punctuation())
1008
+ await config.setApi(api)
1009
+ await config.add(gdefaults, sdefaults, pos, negation, stm, meta, punctuation)
1026
1010
  config.initializer( ({objects, config, isModule}) => {
1027
1011
  /* TODO add this beck in. some stuff from config needs to be here
1028
1012
  config.addArgs((args) => ({
@@ -1063,7 +1047,7 @@ const createConfig = () => {
1063
1047
  config.addWord("doesable", { id: "doesAble", "initial": "{}" })
1064
1048
  }
1065
1049
  })
1066
- config.restart_auto_rebuild()
1050
+ await config.restart_auto_rebuild()
1067
1051
  return config
1068
1052
  }
1069
1053