ekms 7.12.8 → 8.0.0-beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (95) hide show
  1. package/common/animals.instance.json +192 -406
  2. package/common/animals.js +1 -1
  3. package/common/avatar.js +7 -5
  4. package/common/characters.js +12 -6
  5. package/common/{pipboyTemplate.instance.json → colors.instance.json} +13784 -8900
  6. package/common/colors.js +71 -0
  7. package/common/colors.test.json +4860 -0
  8. package/common/concept.js +2 -2
  9. package/common/crew.instance.json +3945 -3636
  10. package/common/crew.js +5 -3
  11. package/common/currency.js +0 -2
  12. package/common/dialogues.js +152 -20
  13. package/common/dialogues.test.json +1053 -33
  14. package/common/dimension.instance.json +750 -86
  15. package/common/dimension.js +15 -7
  16. package/common/dimension.test.json +289 -312
  17. package/common/edible.instance.json +446 -578
  18. package/common/edible.js +1 -1
  19. package/common/emotions.instance.json +67 -39
  20. package/common/emotions.js +1 -1
  21. package/common/fastfood.instance.json +1769 -2136
  22. package/common/fastfood.js +2 -2
  23. package/common/fastfood.test.json +7941 -3647
  24. package/common/formulas.instance.json +996 -0
  25. package/common/formulas.js +19 -6
  26. package/common/formulas.test.json +504 -2896
  27. package/common/gdefaults.js +2 -0
  28. package/common/help.js +7 -2
  29. package/common/help.test.json +18 -10
  30. package/common/helpers/concept.js +29 -9
  31. package/common/helpers/dialogues.js +17 -1
  32. package/common/helpers/formulas.js +0 -14
  33. package/common/helpers/meta.js +0 -1
  34. package/common/helpers/properties.js +6 -13
  35. package/common/helpers.js +5 -0
  36. package/common/javascript.js +8 -6
  37. package/common/kirk.instance.json +5 -1
  38. package/common/kirk.js +1 -1
  39. package/common/length.instance.json +417 -811
  40. package/common/length.js +1 -1
  41. package/common/math.instance.json +1938 -1
  42. package/common/math.js +17 -5
  43. package/common/meta.instance.json +1 -1
  44. package/common/meta.js +33 -10
  45. package/common/numbers.js +28 -24
  46. package/common/ordering.instance.json +98 -138
  47. package/common/ordering.js +1 -1
  48. package/common/people.instance.json +68 -121
  49. package/common/people.js +1 -1
  50. package/common/pipboy.instance.json +23411 -1076
  51. package/common/pipboy.js +31 -4
  52. package/common/pipboy.test.json +13 -9
  53. package/common/pokemon.instance.json +172 -223
  54. package/common/pokemon.js +1 -1
  55. package/common/pressure.instance.json +131 -81
  56. package/common/pressure.js +1 -1
  57. package/common/properties.instance.json +25 -49
  58. package/common/properties.js +20 -15
  59. package/common/properties.test.json +17605 -4030
  60. package/common/punctuation.js +8 -0
  61. package/common/punctuation.test.json +233 -5
  62. package/common/reports.instance.json +33 -65
  63. package/common/reports.js +9 -9
  64. package/common/scorekeeper.instance.json +1 -1
  65. package/common/scorekeeper.js +9 -7
  66. package/common/sizeable.js +7 -2
  67. package/common/spock.instance.json +5 -1
  68. package/common/spock.js +1 -1
  69. package/common/stm.js +16 -5
  70. package/common/tell.js +4 -2
  71. package/common/temperature.instance.json +142 -252
  72. package/common/temperature.js +1 -1
  73. package/common/testing.js +0 -1
  74. package/common/time.js +36 -20
  75. package/common/time.test.json +66 -44
  76. package/common/tokenize.js +47 -0
  77. package/common/tokenize.test.json +87 -0
  78. package/common/ui.instance.json +13 -1
  79. package/common/ui.js +0 -1
  80. package/common/weight.instance.json +335 -228
  81. package/common/weight.js +1 -1
  82. package/common/weight.test.json +242 -238
  83. package/main.js +6 -8
  84. package/package.json +10 -18
  85. package/common/dimensionTemplate.instance.json +0 -582
  86. package/common/dimensionTemplate.js +0 -35
  87. package/common/dimensionTemplate.test.json +0 -2
  88. package/common/formulasTemplate.instance.json +0 -483
  89. package/common/formulasTemplate.js +0 -30
  90. package/common/formulasTemplate.test.json +0 -2
  91. package/common/mathTemplate.instance.json +0 -1635
  92. package/common/mathTemplate.js +0 -32
  93. package/common/mathTemplate.test.json +0 -1422
  94. package/common/pipboyTemplate.js +0 -48
  95. package/common/pipboyTemplate.test.json +0 -2
package/common/stm.js CHANGED
@@ -28,7 +28,12 @@ class API {
28
28
  }
29
29
 
30
30
  mentioned(concept, value = undefined) {
31
- concept = { ...concept, pullFromContext: false }
31
+ // TODO value should perhaps have been called id as in concept id and then value could be value
32
+ if (value) {
33
+ concept = { ...concept, pullFromContext: false }
34
+ } else {
35
+ concept.pullFromContext = false
36
+ }
32
37
  if (value) {
33
38
  if (concept.marker == 'unknown') {
34
39
  if (concept.value) {
@@ -37,6 +42,7 @@ class API {
37
42
  }
38
43
  concept.value = value
39
44
  }
45
+ concept.fromSTM = true
40
46
  this._objects.mentioned.unshift(concept)
41
47
  }
42
48
 
@@ -44,7 +50,7 @@ class API {
44
50
  // care about value first
45
51
  for (let m of this._objects.mentioned) {
46
52
  if (context.value && context.value == m.marker) {
47
- return { ...m, fromSTM: true }
53
+ return m
48
54
  }
49
55
  }
50
56
 
@@ -54,21 +60,22 @@ class API {
54
60
  // care about marker second
55
61
  for (let m of this._objects.mentioned) {
56
62
  if (context.marker != 'unknown' && this.isA(m.marker, context.marker)) {
57
- return { ...m, fromSTM: true }
63
+ return m
58
64
  }
59
65
  // if (context.types && context.types.includes(m.marker)) {
60
66
  if (context.types) {
61
67
  for (let parent of context.types) {
62
68
  if (parent != 'unknown' && this.isA(m.marker, parent)) {
63
- return { ...m, fromSTM: true }
69
+ return m
64
70
  }
65
71
  }
66
72
  }
67
73
  }
74
+
68
75
  if (context.types && context.types.length == 1) {
69
76
  for (let m of this._objects.mentioned) {
70
77
  if (context.unknown) {
71
- return { ...m, fromSTM: true }
78
+ return m
72
79
  }
73
80
  }
74
81
  }
@@ -101,6 +108,9 @@ let createConfig = () => {
101
108
  mentioned: (context) => {
102
109
  kms.stm.api.mentioned(context)
103
110
  },
111
+ mentions: (context) => {
112
+ return kms.stm.api.mentions(context)
113
+ },
104
114
  }))
105
115
  })
106
116
  config.api = api
@@ -118,6 +128,7 @@ knowledgeModule( {
118
128
  contents: stm_tests,
119
129
  checks: {
120
130
  context: defaultContextCheck,
131
+ objects: ['mentioned'],
121
132
  },
122
133
  },
123
134
  })
package/common/tell.js CHANGED
@@ -54,8 +54,10 @@ let configStruct = {
54
54
  { id: 'tell', level: 0, bridge: '{ ...next(operator), target: after[0], info: after[1], event: after[2] }' },
55
55
  ],
56
56
  words: {
57
- "when": [{ id: 'info', level: 0, initial: "{ info: 'when' }" }],
58
- "me": [{ id: 'person', level: 0, initial: "{ target: 'me' }" }],
57
+ "literals": {
58
+ "when": [{ id: 'info', level: 0, initial: "{ info: 'when' }" }],
59
+ "me": [{ id: 'person', level: 0, initial: "{ target: 'me' }" }],
60
+ }
59
61
  },
60
62
  hierarchy: [
61
63
  ['is', 'event'],