ekms 9.5.1-beta.5 → 9.5.1-beta.6

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 (70) hide show
  1. package/common/animals.instance.json +21 -61
  2. package/common/asking.js +102 -100
  3. package/common/can.instance.json +17 -0
  4. package/common/can.js +188 -0
  5. package/common/characters.js +3 -3
  6. package/common/colors.instance.json +38 -10
  7. package/common/comparable.instance.json +2 -2
  8. package/common/concept.test.json +54 -40
  9. package/common/conjunction.js +13 -5
  10. package/common/crew.instance.json +26 -26
  11. package/common/crew.js +1 -1
  12. package/common/currency.js +1 -1
  13. package/common/dates.instance.json +87 -3
  14. package/common/dialogues.js +11 -8
  15. package/common/dimension.instance.json +1 -1
  16. package/common/edible.instance.json +79 -95
  17. package/common/emotions.instance.json +6 -10
  18. package/common/emotions.js +1 -1
  19. package/common/english_helpers.js +277 -67
  20. package/common/fastfood.instance.json +235 -807
  21. package/common/fastfood.js +4 -4
  22. package/common/formulas.instance.json +1 -1
  23. package/common/gdefaults.js +41 -9
  24. package/common/help.js +2 -2
  25. package/common/helpers/concept.js +1 -1
  26. package/common/helpers/conjunction.js +54 -44
  27. package/common/helpers/dateTimeSelectors.js +2 -2
  28. package/common/helpers/dialogues.js +1 -1
  29. package/common/helpers/formulas.js +13 -11
  30. package/common/helpers/menus.js +12 -12
  31. package/common/helpers/meta.js +8 -8
  32. package/common/helpers/properties.js +76 -15
  33. package/common/helpers.js +82 -46
  34. package/common/hierarchy.js +3 -3
  35. package/common/kirk.instance.json +1 -1
  36. package/common/length.instance.json +2 -2
  37. package/common/math.instance.json +20 -20
  38. package/common/math.js +45 -44
  39. package/common/menus.instance.json +3 -3
  40. package/common/menus.js +1 -1
  41. package/common/meta.js +49 -33
  42. package/common/ordering.instance.json +16 -28
  43. package/common/ordering.js +1 -1
  44. package/common/ordering.test.json +354 -296
  45. package/common/people.instance.json +36 -47
  46. package/common/people.js +1 -1
  47. package/common/people.test.json +952 -681
  48. package/common/pipboy.instance.json +72 -16
  49. package/common/pokemon.instance.json +8 -8
  50. package/common/pokemon.js +1 -1
  51. package/common/pressure.instance.json +2 -2
  52. package/common/properties.instance.json +1 -1
  53. package/common/properties.js +16 -3
  54. package/common/reminders.js +1 -1
  55. package/common/reports.instance.json +3 -3
  56. package/common/reports.js +18 -16
  57. package/common/scorekeeper.js +4 -4
  58. package/common/sdefaults.js +22 -2
  59. package/common/spock.instance.json +1 -1
  60. package/common/stgame.js +1 -1
  61. package/common/stm.js +2 -2
  62. package/common/tell.js +1 -1
  63. package/common/temperature.instance.json +2 -2
  64. package/common/tester.js +3 -3
  65. package/common/time.js +3 -3
  66. package/common/tokenize.js +1 -1
  67. package/common/weight.instance.json +2 -2
  68. package/common/wp.instance.json +62 -6
  69. package/common/wp.js +4 -4
  70. package/package.json +4 -2
@@ -59,7 +59,7 @@
59
59
  "scope": "testing"
60
60
  },
61
61
  {
62
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
62
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
63
63
  "id": "plusOperator",
64
64
  "level": 0,
65
65
  "bridge": "{ ...next(operator), marker: next(operator('plusExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -80,7 +80,7 @@
80
80
  "generatorp": "({context}) => context.word"
81
81
  },
82
82
  {
83
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
83
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
84
84
  "id": "plusExpression",
85
85
  "level": 0,
86
86
  "bridge": "{ ...next(operator) }",
@@ -88,10 +88,10 @@
88
88
  "mathematicalExpression"
89
89
  ],
90
90
  "generatorp": "async ({gp, context}) => `${await gp(context.x)} ${context.word} ${await gp(context.y)}`",
91
- "evaluator": "async ({e, context}) => {\n const x = toValue(await e(context.x)) \n const y = toValue(await e(context.y))\n if (!x || !y) {\n // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n context.isResponse = false\n } else {\n context.evalue = apply(x, y)\n context.evalue.isResponse = true\n context.evalue.paraphrase = false\n // context.paraphrase = false\n // context.isResponse = true\n }\n /*\n if (!context.value) {\n context.isResponse = false\n context.paraphrase = true\n }\n */\n }"
91
+ "evaluator": "async ({e, context}) => {\n const x = toValue(await e(context.x)) \n const y = toValue(await e(context.y))\n if (!x || !y) {\n // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n context.isResponse = false\n } else {\n context.evalue = apply(x, y)\n context.evalue.isResponse = true\n context.evalue.paraphrase = false\n // context.paraphrase = false\n // context.isResponse = true\n }\n /*\n if (!context.value) {\n context.isResponse = false\n context.paraphrase = true\n }\n */\n }"
92
92
  },
93
93
  {
94
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
94
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
95
95
  "id": "minusOperator",
96
96
  "level": 0,
97
97
  "bridge": "{ ...next(operator), marker: next(operator('minusExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -112,7 +112,7 @@
112
112
  "generatorp": "({context}) => context.word"
113
113
  },
114
114
  {
115
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
115
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
116
116
  "id": "minusExpression",
117
117
  "level": 0,
118
118
  "bridge": "{ ...next(operator) }",
@@ -120,10 +120,10 @@
120
120
  "mathematicalExpression"
121
121
  ],
122
122
  "generatorp": "async ({gp, context}) => `${await gp(context.x)} ${context.word} ${await gp(context.y)}`",
123
- "evaluator": "async ({e, context}) => {\n const x = toValue(await e(context.x)) \n const y = toValue(await e(context.y))\n if (!x || !y) {\n // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n context.isResponse = false\n } else {\n context.evalue = apply(x, y)\n context.evalue.isResponse = true\n context.evalue.paraphrase = false\n // context.paraphrase = false\n // context.isResponse = true\n }\n /*\n if (!context.value) {\n context.isResponse = false\n context.paraphrase = true\n }\n */\n }"
123
+ "evaluator": "async ({e, context}) => {\n const x = toValue(await e(context.x)) \n const y = toValue(await e(context.y))\n if (!x || !y) {\n // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n context.isResponse = false\n } else {\n context.evalue = apply(x, y)\n context.evalue.isResponse = true\n context.evalue.paraphrase = false\n // context.paraphrase = false\n // context.isResponse = true\n }\n /*\n if (!context.value) {\n context.isResponse = false\n context.paraphrase = true\n }\n */\n }"
124
124
  },
125
125
  {
126
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
126
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
127
127
  "id": "timesOperator",
128
128
  "level": 0,
129
129
  "bridge": "{ ...next(operator), marker: next(operator('timesExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -153,7 +153,7 @@
153
153
  "generatorp": "({context}) => context.word"
154
154
  },
155
155
  {
156
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
156
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
157
157
  "id": "timesExpression",
158
158
  "level": 0,
159
159
  "bridge": "{ ...next(operator) }",
@@ -161,10 +161,10 @@
161
161
  "mathematicalExpression"
162
162
  ],
163
163
  "generatorp": "async ({gp, context}) => `${await gp(context.x)} ${context.word} ${await gp(context.y)}`",
164
- "evaluator": "async ({e, context}) => {\n const x = toValue(await e(context.x)) \n const y = toValue(await e(context.y))\n if (!x || !y) {\n // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n context.isResponse = false\n } else {\n context.evalue = apply(x, y)\n context.evalue.isResponse = true\n context.evalue.paraphrase = false\n // context.paraphrase = false\n // context.isResponse = true\n }\n /*\n if (!context.value) {\n context.isResponse = false\n context.paraphrase = true\n }\n */\n }"
164
+ "evaluator": "async ({e, context}) => {\n const x = toValue(await e(context.x)) \n const y = toValue(await e(context.y))\n if (!x || !y) {\n // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n context.isResponse = false\n } else {\n context.evalue = apply(x, y)\n context.evalue.isResponse = true\n context.evalue.paraphrase = false\n // context.paraphrase = false\n // context.isResponse = true\n }\n /*\n if (!context.value) {\n context.isResponse = false\n context.paraphrase = true\n }\n */\n }"
165
165
  },
166
166
  {
167
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
167
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
168
168
  "id": "divideByOperator",
169
169
  "level": 0,
170
170
  "bridge": "{ ...next(operator), marker: next(operator('divideByExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -193,7 +193,7 @@
193
193
  "generatorp": "({context}) => context.word"
194
194
  },
195
195
  {
196
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
196
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
197
197
  "id": "divideByExpression",
198
198
  "level": 0,
199
199
  "bridge": "{ ...next(operator) }",
@@ -201,7 +201,7 @@
201
201
  "mathematicalExpression"
202
202
  ],
203
203
  "generatorp": "async ({gp, context}) => `${await gp(context.x)} ${context.word} ${await gp(context.y)}`",
204
- "evaluator": "async ({e, context}) => {\n const x = toValue(await e(context.x)) \n const y = toValue(await e(context.y))\n if (!x || !y) {\n // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n context.isResponse = false\n } else {\n context.evalue = apply(x, y)\n context.evalue.isResponse = true\n context.evalue.paraphrase = false\n // context.paraphrase = false\n // context.isResponse = true\n }\n /*\n if (!context.value) {\n context.isResponse = false\n context.paraphrase = true\n }\n */\n }"
204
+ "evaluator": "async ({e, context}) => {\n const x = toValue(await e(context.x)) \n const y = toValue(await e(context.y))\n if (!x || !y) {\n // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n context.isResponse = false\n } else {\n context.evalue = apply(x, y)\n context.evalue.isResponse = true\n context.evalue.paraphrase = false\n // context.paraphrase = false\n // context.isResponse = true\n }\n /*\n if (!context.value) {\n context.isResponse = false\n context.paraphrase = true\n }\n */\n }"
205
205
  }
206
206
  ]
207
207
  }
@@ -1131,7 +1131,7 @@
1131
1131
  "scope": "testing"
1132
1132
  },
1133
1133
  {
1134
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
1134
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
1135
1135
  "id": "plusOperator",
1136
1136
  "level": 0,
1137
1137
  "bridge": "{ ...next(operator), marker: next(operator('plusExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -1151,7 +1151,7 @@
1151
1151
  ]
1152
1152
  },
1153
1153
  {
1154
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
1154
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
1155
1155
  "id": "plusExpression",
1156
1156
  "level": 0,
1157
1157
  "bridge": "{ ...next(operator) }",
@@ -1160,7 +1160,7 @@
1160
1160
  ]
1161
1161
  },
1162
1162
  {
1163
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
1163
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
1164
1164
  "id": "minusOperator",
1165
1165
  "level": 0,
1166
1166
  "bridge": "{ ...next(operator), marker: next(operator('minusExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -1180,7 +1180,7 @@
1180
1180
  ]
1181
1181
  },
1182
1182
  {
1183
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
1183
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
1184
1184
  "id": "minusExpression",
1185
1185
  "level": 0,
1186
1186
  "bridge": "{ ...next(operator) }",
@@ -1189,7 +1189,7 @@
1189
1189
  ]
1190
1190
  },
1191
1191
  {
1192
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
1192
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
1193
1193
  "id": "timesOperator",
1194
1194
  "level": 0,
1195
1195
  "bridge": "{ ...next(operator), marker: next(operator('timesExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -1218,7 +1218,7 @@
1218
1218
  ]
1219
1219
  },
1220
1220
  {
1221
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
1221
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
1222
1222
  "id": "timesExpression",
1223
1223
  "level": 0,
1224
1224
  "bridge": "{ ...next(operator) }",
@@ -1227,7 +1227,7 @@
1227
1227
  ]
1228
1228
  },
1229
1229
  {
1230
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:32",
1230
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
1231
1231
  "id": "divideByOperator",
1232
1232
  "level": 0,
1233
1233
  "bridge": "{ ...next(operator), marker: next(operator('divideByExpression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }",
@@ -1255,7 +1255,7 @@
1255
1255
  ]
1256
1256
  },
1257
1257
  {
1258
- "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:44",
1258
+ "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:45",
1259
1259
  "id": "divideByExpression",
1260
1260
  "level": 0,
1261
1261
  "bridge": "{ ...next(operator) }",
package/common/math.js CHANGED
@@ -18,7 +18,7 @@ const instance = require('./math.instance.json')
18
18
 
19
19
 
20
20
  // TODO need to deal with value vs evalue
21
- const toValue = (context) => {
21
+ function toValue(context) {
22
22
  while( true ) {
23
23
  if (typeof context == 'number' || !context) {
24
24
  return context
@@ -27,48 +27,49 @@ const toValue = (context) => {
27
27
  }
28
28
  }
29
29
 
30
- const mathematicalOperator = (name, words, apply, before = []) => [
31
- {
32
- where: where(),
33
- id: `${name}Operator`, level: 0,
34
- bridge: `{ ...next(operator), marker: next(operator('${name}Expression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }` ,
35
- // bridge: `{ ...next(operator), marker: next(operator('${name}Expression')), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }` ,
36
- isA: ['mathematical_operator'],
37
- before,
38
- localHierarchy: [ ['unknown', 'number'] ],
39
- // levelSpecificHierarchy: [[1, 'mathematicalExpression']],
40
- words,
41
- generatorp: ({context}) => context.word,
42
- },
43
- {
44
- where: where(),
45
- id: `${name}Expression`, level: 0,
46
- bridge: "{ ...next(operator) }" ,
47
- isA: ['mathematicalExpression'],
48
- generatorp: async ({gp, context}) => `${await gp(context.x)} ${context.word} ${await gp(context.y)}`,
49
- evaluator: async ({e, context}) => {
50
- const x = toValue(await e(context.x))
51
- const y = toValue(await e(context.y))
52
- if (!x || !y) {
53
- // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }
54
- context.isResponse = false
55
- } else {
56
- context.evalue = apply(x, y)
57
- context.evalue.isResponse = true
58
- context.evalue.paraphrase = false
59
- // context.paraphrase = false
60
- // context.isResponse = true
61
- }
62
- /*
63
- if (!context.value) {
64
- context.isResponse = false
65
- context.paraphrase = true
30
+ function mathematicalOperator(name, words, apply, before = []) {
31
+ return [
32
+ {
33
+ where: where(),
34
+ id: `${name}Operator`, level: 0,
35
+ bridge: `{ ...next(operator), marker: next(operator('${name}Expression')), types: lub(append(['mathematicalExpression'], operator.types, before[0].types, after[0].types)), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }` ,
36
+ // bridge: `{ ...next(operator), marker: next(operator('${name}Expression')), value: null, x: before[0], y: after[0], number: 'one', isResponse: true, evaluate: true }` ,
37
+ isA: ['mathematical_operator'],
38
+ before,
39
+ localHierarchy: [ ['unknown', 'number'] ],
40
+ // levelSpecificHierarchy: [[1, 'mathematicalExpression']],
41
+ words,
42
+ generatorp: ({context}) => context.word,
43
+ },
44
+ {
45
+ where: where(),
46
+ id: `${name}Expression`, level: 0,
47
+ bridge: "{ ...next(operator) }" ,
48
+ isA: ['mathematicalExpression'],
49
+ generatorp: async ({gp, context}) => `${await gp(context.x)} ${context.word} ${await gp(context.y)}`,
50
+ evaluator: async ({e, context}) => {
51
+ const x = toValue(await e(context.x))
52
+ const y = toValue(await e(context.y))
53
+ if (!x || !y) {
54
+ // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }
55
+ context.isResponse = false
56
+ } else {
57
+ context.evalue = apply(x, y)
58
+ context.evalue.isResponse = true
59
+ context.evalue.paraphrase = false
60
+ // context.paraphrase = false
61
+ // context.isResponse = true
62
+ }
63
+ /*
64
+ if (!context.value) {
65
+ context.isResponse = false
66
+ context.paraphrase = true
67
+ }
68
+ */
66
69
  }
67
- */
68
- }
69
- }
70
- ]
71
-
70
+ }
71
+ ]
72
+ }
72
73
  const config = {
73
74
  name: 'math',
74
75
  operators: [
@@ -96,8 +97,8 @@ const config = {
96
97
  before: ['verb'],
97
98
  after: ['adjective'],
98
99
  },
99
- { id: "x", isA: ['number'], level: 0, bridge: '{ ...next(operator) }', scope: "testing"},
100
- { id: "y", isA: ['number'], level: 0, bridge: '{ ...next(operator) }', scope: "testing"},
100
+ { id: "x", isA: ['number'], level: 0, bridge: '{ ...next(operator) }', scope: "testing" },
101
+ { id: "y", isA: ['number'], level: 0, bridge: '{ ...next(operator) }', scope: "testing" },
101
102
  ...mathematicalOperator('plus', ['plus', '+'], (x, y) => x + y),
102
103
  ...mathematicalOperator('minus', ['minus', '-'], (x, y) => x - y),
103
104
  ...mathematicalOperator('times', ['times', '*'], (x, y) => x * y, [['plusOperator', 0], ['minusOperator', 0]]),
@@ -2075,7 +2075,7 @@
2075
2075
  "word": "menu",
2076
2076
  "range": {
2077
2077
  "start": 0,
2078
- "end": 16
2078
+ "end": 3
2079
2079
  },
2080
2080
  "dead": true,
2081
2081
  "types": [
@@ -3353,7 +3353,7 @@
3353
3353
  "word": "item",
3354
3354
  "range": {
3355
3355
  "start": 0,
3356
- "end": 16
3356
+ "end": 3
3357
3357
  },
3358
3358
  "dead": true,
3359
3359
  "types": [
@@ -6017,7 +6017,7 @@
6017
6017
  "text": "menus and menu items",
6018
6018
  "range": {
6019
6019
  "start": 0,
6020
- "end": 32
6020
+ "end": 19
6021
6021
  },
6022
6022
  "types": [
6023
6023
  "list",
package/common/menus.js CHANGED
@@ -214,7 +214,7 @@ class UIAPI {
214
214
  file (<- instance of menu) menu (<- concept of menu)
215
215
  */
216
216
  // called for the non-module load to setup fixtures
217
- const fixtures = async ({api, fragment, s, config, objects, kms, isModule}) => {
217
+ async function fixtures({api, fragment, s, config, objects, kms, isModule}) {
218
218
  const fileMenuId = api.addMenu('file')
219
219
  const objectMenuId = api.addMenu('object')
220
220
 
package/common/meta.js CHANGED
@@ -206,10 +206,14 @@ const config = {
206
206
  // setup the read semantic
207
207
 
208
208
  // !topLevel or maybe !value??!?!
209
- const match = (defContext) => ({context}) => context.marker == (defContext.consequence || {}).marker && context.query // && !context.value
210
- const apply = (DEFINITIONs, DERIVED) => {
209
+ function match(defContext) {
210
+ return ({context}) => context.marker == (defContext.consequence || {}).marker && context.query // && !context.value
211
+ }
212
+ function apply(DEFINITIONs, DERIVED) {
211
213
  const mappingss = translationMappings(DEFINITIONs, DERIVED)
212
- const invertMappings = (mappings) => mappings.map( ({ from, to }) => { return { to: from, from: to } } )
214
+ function invertMappings(mappings) {
215
+ return mappings.map( ({ from, to }) => { return { to: from, from: to } } )
216
+ }
213
217
  return async ({context, s, config}) => {
214
218
  DEFINITIONs = _.cloneDeep(DEFINITIONs)
215
219
  //const mappings = mappingss[0]
@@ -306,15 +310,21 @@ const config = {
306
310
  apply: async ({config, context, g}) => {
307
311
  // setup the write semantic
308
312
  {
309
- const matchByMarker = (defContext) => ({context}) => context.marker == defContext.from.marker && !context.query && !context.objects
310
- const matchByValue = (defContext) => ({context}) => context.evalue == defContext.from.value && !context.query && !context.objects
311
- const apply = (mappings, TO) => async ({context, s}) => {
312
- TO = _.cloneDeep(TO)
313
- for (const { from, to } of mappings) {
314
- hashIndexesSet(TO, to, hashIndexesGet(context, from))
313
+ function matchByMarker(defContext) {
314
+ return ({context}) => context.marker == defContext.from.marker && !context.query && !context.objects
315
+ }
316
+ function matchByValue(defContext) {
317
+ return ({context}) => context.evalue == defContext.from.value && !context.query && !context.objects
318
+ }
319
+ function apply(mappings, TO) {
320
+ return async ({context, s}) => {
321
+ TO = _.cloneDeep(TO)
322
+ for (const { from, to } of mappings) {
323
+ hashIndexesSet(TO, to, hashIndexesGet(context, from))
324
+ }
325
+ toPrime = await s(TO)
326
+ context.result = toPrime.result
315
327
  }
316
- toPrime = await s(TO)
317
- context.result = toPrime.result
318
328
  }
319
329
  const mappings = translationMapping(context.from, context.to)
320
330
  let match = matchByMarker(context)
@@ -333,30 +343,36 @@ const config = {
333
343
 
334
344
  // setup the read semantic
335
345
  {
336
- const matchByMarker = (defContext) => ({context, uuid}) => context.marker == defContext.from.marker && (context.query || context.evaluate) && !context[`disable${uuid}`]
337
- const matchByValue = (defContext) => ({context, uuid}) => context.value == defContext.from.value && (context.query || context.evaluate) && !context[`disable${uuid}`]
338
- const apply = (mappings, TO) => async ({uuid, context, s, g, config}) => {
339
- TO = _.cloneDeep(TO)
340
- for (const { from, to } of mappings) {
341
- hashIndexesSet(TO, to, hashIndexesGet(context, from))
342
- }
343
- // next move add debug arg to s and g
344
- // TODO why is there query and evaluate?
345
- if (context.query) {
346
- TO.query = context.query
347
- } else {
348
- TO.evaluate = context.evaluate
349
- }
350
- TO[`disable${uuid}`] = true
351
- toPrime = await s(TO)
352
- if (context.query) {
353
- if (toPrime.evalue) {
354
- context.evalue = toPrime.evalue
346
+ function matchByMarker(defContext) {
347
+ return ({context, uuid}) => context.marker == defContext.from.marker && (context.query || context.evaluate) && !context[`disable${uuid}`]
348
+ }
349
+ function matchByValue(defContext) {
350
+ return ({context, uuid}) => context.value == defContext.from.value && (context.query || context.evaluate) && !context[`disable${uuid}`]
351
+ }
352
+ function apply(mappings, TO) {
353
+ return async ({uuid, context, s, g, config}) => {
354
+ TO = _.cloneDeep(TO)
355
+ for (const { from, to } of mappings) {
356
+ hashIndexesSet(TO, to, hashIndexesGet(context, from))
357
+ }
358
+ // next move add debug arg to s and g
359
+ // TODO why is there query and evaluate?
360
+ if (context.query) {
361
+ TO.query = context.query
362
+ } else {
363
+ TO.evaluate = context.evaluate
364
+ }
365
+ TO[`disable${uuid}`] = true
366
+ toPrime = await s(TO)
367
+ if (context.query) {
368
+ if (toPrime.evalue) {
369
+ context.evalue = toPrime.evalue
370
+ } else {
371
+ context.evalue = toPrime
372
+ }
355
373
  } else {
356
- context.evalue = toPrime
374
+ context.evalue = toPrime.evalue
357
375
  }
358
- } else {
359
- context.evalue = toPrime.evalue
360
376
  }
361
377
  }
362
378
  const mappings = translationMapping(context.from, context.to)
@@ -594,7 +594,7 @@
594
594
  "word": "wants",
595
595
  "range": {
596
596
  "start": 0,
597
- "end": 37
597
+ "end": 4
598
598
  },
599
599
  "dead": true,
600
600
  "types": [
@@ -2207,12 +2207,7 @@
2207
2207
  },
2208
2208
  "do": {
2209
2209
  "left": "liker",
2210
- "right": "likee",
2211
- "range": {
2212
- "start": 3,
2213
- "end": 11
2214
- },
2215
- "text": "ikes y"
2210
+ "right": "likee"
2216
2211
  },
2217
2212
  "liker": {
2218
2213
  "value": "x",
@@ -2253,8 +2248,8 @@
2253
2248
  "marker": "like",
2254
2249
  "word": "likes",
2255
2250
  "range": {
2256
- "start": 3,
2257
- "end": 11
2251
+ "start": 5,
2252
+ "end": 9
2258
2253
  },
2259
2254
  "evaluateWord": true,
2260
2255
  "imperative": false,
@@ -2274,7 +2269,8 @@
2274
2269
  "property": "liker"
2275
2270
  },
2276
2271
  {
2277
- "property": "operator"
2272
+ "property": "operator",
2273
+ "number": "liker"
2278
2274
  },
2279
2275
  {
2280
2276
  "property": "likee"
@@ -2298,12 +2294,7 @@
2298
2294
  },
2299
2295
  "do": {
2300
2296
  "left": "lover",
2301
- "right": "lovee",
2302
- "range": {
2303
- "start": 16,
2304
- "end": 24
2305
- },
2306
- "text": ""
2297
+ "right": "lovee"
2307
2298
  },
2308
2299
  "lover": {
2309
2300
  "value": "x",
@@ -2344,8 +2335,8 @@
2344
2335
  "marker": "love",
2345
2336
  "word": "loves",
2346
2337
  "range": {
2347
- "start": 16,
2348
- "end": 24
2338
+ "start": 18,
2339
+ "end": 22
2349
2340
  },
2350
2341
  "evaluateWord": true,
2351
2342
  "imperative": false,
@@ -2365,7 +2356,8 @@
2365
2356
  "property": "lover"
2366
2357
  },
2367
2358
  {
2368
- "property": "operator"
2359
+ "property": "operator",
2360
+ "number": "lover"
2369
2361
  },
2370
2362
  {
2371
2363
  "property": "lovee"
@@ -2395,12 +2387,7 @@
2395
2387
  },
2396
2388
  "do": {
2397
2389
  "left": "wanter",
2398
- "right": "wantee",
2399
- "range": {
2400
- "start": 31,
2401
- "end": 39
2402
- },
2403
- "text": ""
2390
+ "right": "wantee"
2404
2391
  },
2405
2392
  "wanter": {
2406
2393
  "value": "x",
@@ -2440,8 +2427,8 @@
2440
2427
  "marker": "want",
2441
2428
  "word": "wants",
2442
2429
  "range": {
2443
- "start": 31,
2444
- "end": 39
2430
+ "start": 33,
2431
+ "end": 37
2445
2432
  },
2446
2433
  "evaluateWord": true,
2447
2434
  "imperative": false,
@@ -2462,7 +2449,8 @@
2462
2449
  "property": "wanter"
2463
2450
  },
2464
2451
  {
2465
- "property": "operator"
2452
+ "property": "operator",
2453
+ "number": "wanter"
2466
2454
  },
2467
2455
  {
2468
2456
  "property": "wantee"
@@ -32,7 +32,7 @@ const api = new API();
32
32
 
33
33
  if a likes b then a wants b
34
34
  */
35
- const initializer = ({config, km}) => {
35
+ function initializer({config, km}) {
36
36
  const oapi = km('ordering').api
37
37
  oapi.createOrdering({ name: 'preference', categories: [ ['love', 'like'], ['hate', 'dislike'] ], ordering: [ ['love', 'like'], ['like', 'dislike'], ['dislike', 'hate'] ] })
38
38
  const papi = km('properties').api