@agentshouse/mdruntime 0.1.0-ce5c5bb29be5a → 0.1.0-ce6bc9239a3ee

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 (201) hide show
  1. package/README.md +2 -2
  2. package/dist/acceptance.d.ts +26 -0
  3. package/dist/acceptance.d.ts.map +1 -0
  4. package/dist/acceptance.js +384 -0
  5. package/dist/adapter.d.ts +81 -49
  6. package/dist/adapter.d.ts.map +1 -1
  7. package/dist/attached-model.d.ts +3 -10
  8. package/dist/attached-model.d.ts.map +1 -1
  9. package/dist/attached-model.js +21 -56
  10. package/dist/bootstrap.d.ts +9 -5
  11. package/dist/bootstrap.d.ts.map +1 -1
  12. package/dist/bootstrap.js +209 -75
  13. package/dist/chain.d.ts +2 -1
  14. package/dist/chain.d.ts.map +1 -1
  15. package/dist/change.d.ts +1 -0
  16. package/dist/change.d.ts.map +1 -1
  17. package/dist/chat-types.d.ts +3 -0
  18. package/dist/chat-types.d.ts.map +1 -0
  19. package/dist/chat-types.js +2 -0
  20. package/dist/client.d.ts +16 -6
  21. package/dist/client.d.ts.map +1 -1
  22. package/dist/client.js +3 -1
  23. package/dist/collection.d.ts +2 -1
  24. package/dist/collection.d.ts.map +1 -1
  25. package/dist/compile.d.ts +6 -6
  26. package/dist/compile.d.ts.map +1 -1
  27. package/dist/compile.js +262 -318
  28. package/dist/connection.d.ts +20 -44
  29. package/dist/connection.d.ts.map +1 -1
  30. package/dist/connection.js +1438 -3393
  31. package/dist/context.d.ts +2 -0
  32. package/dist/context.d.ts.map +1 -0
  33. package/dist/context.js +7 -0
  34. package/dist/conversation-row.d.ts +33 -0
  35. package/dist/conversation-row.d.ts.map +1 -0
  36. package/dist/conversation-row.js +47 -0
  37. package/dist/conversation.d.ts +26 -17
  38. package/dist/conversation.d.ts.map +1 -1
  39. package/dist/conversation.js +441 -307
  40. package/dist/durability.d.ts +6 -0
  41. package/dist/durability.d.ts.map +1 -1
  42. package/dist/entry.d.ts +2 -2
  43. package/dist/entry.d.ts.map +1 -1
  44. package/dist/entry.js +17 -7
  45. package/dist/figures.d.ts +48 -0
  46. package/dist/figures.d.ts.map +1 -0
  47. package/dist/figures.js +197 -0
  48. package/dist/host.d.ts +4 -6
  49. package/dist/host.d.ts.map +1 -1
  50. package/dist/host.js +22 -26
  51. package/dist/identity.d.ts +0 -1
  52. package/dist/identity.d.ts.map +1 -1
  53. package/dist/identity.js +0 -3
  54. package/dist/index.d.ts +18 -8
  55. package/dist/index.d.ts.map +1 -1
  56. package/dist/index.js +5 -1
  57. package/dist/install.d.ts +86 -0
  58. package/dist/install.d.ts.map +1 -0
  59. package/dist/install.js +537 -0
  60. package/dist/job.d.ts +33 -0
  61. package/dist/job.d.ts.map +1 -0
  62. package/dist/job.js +54 -0
  63. package/dist/live.d.ts +5 -4
  64. package/dist/live.d.ts.map +1 -1
  65. package/dist/live.js +63 -22
  66. package/dist/log.d.ts +1 -0
  67. package/dist/log.d.ts.map +1 -1
  68. package/dist/memory.d.ts +11 -4
  69. package/dist/memory.d.ts.map +1 -1
  70. package/dist/memory.js +171 -81
  71. package/dist/messages.d.ts +27 -3
  72. package/dist/messages.d.ts.map +1 -1
  73. package/dist/messages.js +97 -19
  74. package/dist/model.d.ts +2 -9
  75. package/dist/model.d.ts.map +1 -1
  76. package/dist/model.js +0 -9
  77. package/dist/observation.d.ts +2 -2
  78. package/dist/observation.d.ts.map +1 -1
  79. package/dist/observation.js +7 -2
  80. package/dist/outcome.d.ts +1 -0
  81. package/dist/outcome.d.ts.map +1 -1
  82. package/dist/outcome.js +3 -0
  83. package/dist/overlay.d.ts +1 -0
  84. package/dist/overlay.d.ts.map +1 -1
  85. package/dist/overlay.js +11 -0
  86. package/dist/parts.d.ts +59 -0
  87. package/dist/parts.d.ts.map +1 -0
  88. package/dist/parts.js +118 -0
  89. package/dist/query.d.ts +14 -209
  90. package/dist/query.d.ts.map +1 -1
  91. package/dist/query.js +3 -505
  92. package/dist/questions.d.ts +32 -0
  93. package/dist/questions.d.ts.map +1 -0
  94. package/dist/questions.js +118 -0
  95. package/dist/reach.d.ts +12 -12
  96. package/dist/reach.d.ts.map +1 -1
  97. package/dist/reach.js +182 -136
  98. package/dist/react.d.ts +5 -2
  99. package/dist/react.d.ts.map +1 -1
  100. package/dist/read.d.ts +7 -0
  101. package/dist/read.d.ts.map +1 -0
  102. package/dist/read.js +17 -0
  103. package/dist/readiness.d.ts +0 -2
  104. package/dist/readiness.d.ts.map +1 -1
  105. package/dist/reads.d.ts +36 -0
  106. package/dist/reads.d.ts.map +1 -0
  107. package/dist/reads.js +136 -0
  108. package/dist/recovery.d.ts.map +1 -1
  109. package/dist/recovery.js +9 -1
  110. package/dist/refresh.d.ts +6 -4
  111. package/dist/refresh.d.ts.map +1 -1
  112. package/dist/refresh.js +32 -4
  113. package/dist/replica.d.ts +8 -8
  114. package/dist/replica.d.ts.map +1 -1
  115. package/dist/replica.js +50 -15
  116. package/dist/room-draft.d.ts +4 -3
  117. package/dist/room-draft.d.ts.map +1 -1
  118. package/dist/room-draft.js +65 -52
  119. package/dist/room-drafts.d.ts +29 -0
  120. package/dist/room-drafts.d.ts.map +1 -0
  121. package/dist/room-drafts.js +216 -0
  122. package/dist/rows.d.ts +14 -21
  123. package/dist/rows.d.ts.map +1 -1
  124. package/dist/rows.js +48 -184
  125. package/dist/save.d.ts.map +1 -1
  126. package/dist/save.js +11 -8
  127. package/dist/saves.d.ts +96 -0
  128. package/dist/saves.d.ts.map +1 -0
  129. package/dist/saves.js +999 -0
  130. package/dist/search.d.ts +12 -63
  131. package/dist/search.d.ts.map +1 -1
  132. package/dist/search.js +9 -52
  133. package/dist/seed.d.ts +16 -2
  134. package/dist/seed.d.ts.map +1 -1
  135. package/dist/seed.js +66 -0
  136. package/dist/socket/admission.d.ts +7 -0
  137. package/dist/socket/admission.d.ts.map +1 -0
  138. package/dist/socket/admission.js +39 -0
  139. package/dist/socket/answers.d.ts +6 -0
  140. package/dist/socket/answers.d.ts.map +1 -0
  141. package/dist/socket/answers.js +20 -0
  142. package/dist/socket/reads.d.ts +10 -0
  143. package/dist/socket/reads.d.ts.map +1 -0
  144. package/dist/socket/reads.js +31 -0
  145. package/dist/socket.d.ts +43 -0
  146. package/dist/socket.d.ts.map +1 -0
  147. package/dist/socket.js +96 -0
  148. package/dist/source.d.ts +61 -0
  149. package/dist/source.d.ts.map +1 -0
  150. package/dist/source.js +81 -0
  151. package/dist/status.d.ts +0 -2
  152. package/dist/status.d.ts.map +1 -1
  153. package/dist/status.js +0 -6
  154. package/dist/store/fences.d.ts +16 -0
  155. package/dist/store/fences.d.ts.map +1 -0
  156. package/dist/store/fences.js +26 -0
  157. package/dist/store/installs.d.ts +30 -0
  158. package/dist/store/installs.d.ts.map +1 -0
  159. package/dist/store/installs.js +34 -0
  160. package/dist/store/records.d.ts +212 -0
  161. package/dist/store/records.d.ts.map +1 -0
  162. package/dist/store/records.js +408 -0
  163. package/dist/store/room-held.d.ts +8 -0
  164. package/dist/store/room-held.d.ts.map +1 -0
  165. package/dist/store/room-held.js +17 -0
  166. package/dist/store/watchers.d.ts +15 -0
  167. package/dist/store/watchers.d.ts.map +1 -0
  168. package/dist/store/watchers.js +36 -0
  169. package/dist/store/writes.d.ts +24 -0
  170. package/dist/store/writes.d.ts.map +1 -0
  171. package/dist/store/writes.js +125 -0
  172. package/dist/store.d.ts +78 -145
  173. package/dist/store.d.ts.map +1 -1
  174. package/dist/store.js +117 -367
  175. package/dist/stored.d.ts +58 -32
  176. package/dist/stored.d.ts.map +1 -1
  177. package/dist/stored.js +264 -187
  178. package/dist/tables.d.ts +107 -25
  179. package/dist/tables.d.ts.map +1 -1
  180. package/dist/tables.js +193 -47
  181. package/dist/tallies.d.ts +18 -0
  182. package/dist/tallies.d.ts.map +1 -0
  183. package/dist/tallies.js +129 -0
  184. package/dist/validation.d.ts.map +1 -1
  185. package/dist/validation.js +7 -4
  186. package/dist/windows.d.ts +1 -12
  187. package/dist/windows.d.ts.map +1 -1
  188. package/dist/windows.js +2 -75
  189. package/dist/wire.d.ts +15 -4
  190. package/dist/wire.d.ts.map +1 -1
  191. package/dist/wire.js +6 -1
  192. package/package.json +2 -2
  193. package/dist/fence.d.ts +0 -6
  194. package/dist/fence.d.ts.map +0 -1
  195. package/dist/fence.js +0 -10
  196. package/dist/fulltext.d.ts +0 -27
  197. package/dist/fulltext.d.ts.map +0 -1
  198. package/dist/fulltext.js +0 -370
  199. package/dist/words.d.ts +0 -19
  200. package/dist/words.d.ts.map +0 -1
  201. package/dist/words.js +0 -156
package/dist/compile.js CHANGED
@@ -1,125 +1,36 @@
1
- import { ARRAY_INDEX, parse, pointerSegments } from '@agentshouse/mdmodel';
1
+ import { ARRAY_INDEX, bodied, byCodePoint, compared, cursorOf, heldKind, parse, pointerSegments, sql, } from '@agentshouse/mdmodel';
2
2
  import { binaryRecord } from './binary.js';
3
- import { documentKey, kindOf, pathOfKey, placedOf, roomOfKey } from './rows.js';
4
- import { byCodePoint, compared, cursorOf, FROM_START, MAXIMUM_WINDOW, } from './windows.js';
5
- const VISIBLE = (alias) => `${alias}.visible = 1 AND ${alias}.present = 1 AND ${alias}.queried = 1`;
6
- function fragment(sql, bind = []) {
7
- return { sql, bind };
8
- }
9
- function joined(parts, separator) {
10
- return {
11
- sql: parts.map((part) => part.sql).join(separator),
12
- bind: parts.flatMap((part) => part.bind),
13
- };
14
- }
15
- function balanced(parts, separator) {
16
- if (parts.length === 1)
17
- return grouped(parts[0]);
18
- const half = Math.ceil(parts.length / 2);
19
- return grouped(joined([balanced(parts.slice(0, half), separator), balanced(parts.slice(half), separator)], separator));
20
- }
21
- function all(parts) {
22
- return parts.length === 0 ? fragment('1') : balanced(parts, ' AND ');
23
- }
24
- function any(parts) {
25
- return parts.length === 0 ? fragment('0') : balanced(parts, ' OR ');
26
- }
27
- function grouped(part) {
28
- return { sql: `(${part.sql})`, bind: part.bind };
29
- }
30
- function list(values) {
31
- return fragment(`(${values.map(() => '?').join(', ')})`, values);
32
- }
33
- function sqlValue(value) {
34
- if (value === null)
35
- return { kind: 'null', value: null };
36
- if (typeof value === 'boolean')
37
- return { kind: 'boolean', value: value ? 1 : 0 };
38
- if (typeof value === 'number')
39
- return { kind: 'number', value };
40
- return { kind: 'string', value };
41
- }
42
- function same(alias, value) {
43
- const held = sqlValue(value);
44
- return held.kind === 'null'
45
- ? fragment(`${alias}.kind = 'null'`)
46
- : fragment(`${alias}.kind = ? AND ${alias}.value = ?`, [held.kind, held.value]);
47
- }
48
- const BOUNDS = { gt: '>', gte: '>=', lt: '<', lte: '<=' };
49
- function pointed(alias, field, reach) {
50
- const { keys, places, glob } = placedOf(field, reach);
51
- return fragment(`${alias}.keys = ? AND ${alias}.places ${glob ? 'GLOB' : '='} ?`, [keys, places]);
52
- }
53
- function heldValues(doc, field, alias, where) {
54
- return joined([
55
- fragment(`SELECT 1 FROM replica_values ${alias} WHERE ${alias}.doc = ${doc}.id AND `),
56
- grouped(pointed(alias, field, 'value')),
57
- fragment(' AND '),
58
- grouped(where),
59
- ], '');
60
- }
61
- function exists(part) {
62
- return { sql: `EXISTS (${part.sql})`, bind: part.bind };
63
- }
64
- function itemOf(held, where) {
65
- return exists(joined([
66
- fragment(`SELECT 1 FROM replica_values i WHERE i.doc = ${held}.doc AND i.keys = ${held}.keys AND i.places = ${held}.places AND i.item >= 0 AND `),
67
- grouped(where),
68
- ], ''));
69
- }
70
- function matching(held, values) {
71
- return any(values.map((value) => any([
72
- same(held, value),
73
- all([fragment(`${held}.kind = 'array'`), itemOf(held, same('i', value))]),
74
- ])));
75
- }
76
- function tested(doc, field, test) {
77
- const reached = exists(heldValues(doc, field, 'r', fragment('r.item = -1')));
78
- if (test.op === 'exists')
79
- return test.exists ? reached : fragment(`NOT ${reached.sql}`, reached.bind);
80
- if (test.op === 'eq' || test.op === 'in') {
81
- const values = test.op === 'eq' ? [test.value] : test.values;
82
- return exists(heldValues(doc, field, 'v', any(values.map((value) => same('v', value)))));
83
- }
84
- if (test.op === 'ne' || test.op === 'nin') {
85
- const values = test.op === 'ne' ? [test.value] : test.values;
86
- const unmatched = matching('h', values);
87
- return any([
88
- fragment(`NOT ${reached.sql}`, reached.bind),
89
- exists(heldValues(doc, field, 'h', all([fragment('h.item = -1'), fragment(`NOT (${unmatched.sql})`, unmatched.bind)]))),
90
- ]);
91
- }
92
- if (test.op === 'range') {
93
- return exists(heldValues(doc, field, 'v', all([
94
- fragment('v.item = -1'),
95
- ...test.bounds.map(([operator, bound]) => {
96
- const held = sqlValue(bound);
97
- return fragment(`v.kind = ? AND v.value ${BOUNDS[operator]} ?`, [
98
- held.kind,
99
- held.value,
100
- ]);
101
- }),
102
- ])));
103
- }
104
- if (test.op === 'all') {
105
- return exists(heldValues(doc, field, 'h', all([
106
- fragment("h.item = -1 AND h.kind = 'array'"),
107
- ...test.values.map((value) => itemOf('h', same('i', value))),
108
- ])));
109
- }
110
- return exists(heldValues(doc, field, 'v', fragment("v.item = -1 AND v.kind = 'array' AND v.size = ?", [test.size])));
3
+ import { documentKey, pathOfKey, roomOfKey } from './rows.js';
4
+ import { FROM_START, MAXIMUM_WINDOW } from './windows.js';
5
+ const { all, any, exists, fragment, grouped, joined, listed } = sql;
6
+ export const VISIBLE = (alias) => `${alias}.visible = 1 AND ${alias}.present = 1 AND ${alias}.queried = 1`;
7
+ function located(alias) {
8
+ return fragment(`(SELECT k.locator FROM replica_keys k WHERE k.key = ${alias}.key)`);
9
+ }
10
+ export function within(alias, path) {
11
+ return fragment(`(${alias}.path = ? OR (${alias}.path >= ? AND ${alias}.path < ?))`, [
12
+ path,
13
+ `${path}/`,
14
+ `${path}0`,
15
+ ]);
111
16
  }
112
- function conditioned(doc, condition) {
113
- if ('every' in condition)
114
- return all(condition.every.map((one) => conditioned(doc, one)));
115
- if ('some' in condition)
116
- return any(condition.some.map((one) => conditioned(doc, one)));
117
- return tested(doc, condition.field, condition.test);
17
+ function ancestors(area) {
18
+ const depth = area.path.split('/').length;
19
+ return area.open.flatMap((open) => {
20
+ const segments = open.split('/');
21
+ return segments.slice(depth - 1, -1).map((_, at) => segments.slice(0, depth + at).join('/'));
22
+ });
118
23
  }
119
- function located(bound, alias) {
120
- if (bound.rooms.length === 0)
121
- return fragment("''");
122
- return fragment(`CASE ${alias}.key ${bound.rooms.map(() => 'WHEN ? THEN ?').join(' ')} END`, bound.rooms.flatMap(({ key, locator }) => [key, locator]));
24
+ function fenced(alias, key, area, folders) {
25
+ const opened = any([
26
+ ...area.open.map((open) => within(alias, open)),
27
+ ...(folders ? ancestors(area).map((path) => fragment(`${alias}.path = ?`, [path])) : []),
28
+ ]);
29
+ return all([
30
+ fragment(`${alias}.key = ?`, [key]),
31
+ within(alias, area.path),
32
+ fragment(`NOT ${grouped(opened).sql}`, opened.bind),
33
+ ]);
123
34
  }
124
35
  function reached(bound, alias) {
125
36
  const reach = bound.reach;
@@ -133,44 +44,20 @@ function reached(bound, alias) {
133
44
  const key = bound.keys.get(roomOfKey(held));
134
45
  return key === undefined ? [] : [[key, pathOfKey(held)]];
135
46
  });
136
- const areas = reach.areas.flatMap((area) => {
47
+ const outside = any(reach.areas.flatMap((area) => {
137
48
  const key = bound.keys.get(area.room);
138
- return key === undefined ? [] : [{ key, path: area.path, types: area.types }];
139
- });
140
- const beneath = (area) => fragment(`${alias}.key = ? AND (${alias}.path = ? OR (${alias}.path >= ? AND ${alias}.path < ?))`, [area.key, area.path, `${area.path}/`, `${area.path}0`]);
141
- const typed = (types) => fragment(`${alias}.type IN ${list(types).sql}`, types);
142
- const outside = any(areas.map((area) => area.types.length === 0
143
- ? beneath(area)
144
- : all([beneath(area), fragment(`NOT ${grouped(typed(area.types)).sql}`, area.types)])));
49
+ return key === undefined ? [] : [fenced(alias, key, area, false)];
50
+ }));
145
51
  return all([
146
52
  any([
147
- ...(rooms.length === 0 ? [] : [fragment(`${alias}.key IN ${list(rooms).sql}`, rooms)]),
53
+ ...(rooms.length === 0 ? [] : [fragment(`${alias}.key IN ${listed(rooms).sql}`, rooms)]),
148
54
  ...(documents.length === 0
149
55
  ? []
150
56
  : [
151
57
  fragment(`EXISTS (SELECT 1 FROM json_each(?) j WHERE j.value ->> 0 = ${alias}.key AND j.value ->> 1 = ${alias}.path)`, [JSON.stringify(documents)]),
152
58
  ]),
153
- ...areas.flatMap((area) => area.types.length === 0 ? [] : [all([beneath(area), typed(area.types)])]),
154
59
  ]),
155
- ...(areas.length === 0 ? [] : [fragment(`NOT ${grouped(outside).sql}`, outside.bind)]),
156
- ]);
157
- }
158
- function unindexed(column) {
159
- return `+${column}`;
160
- }
161
- function scoped(alias, scope, byPaths = false) {
162
- const type = byPaths ? unindexed(`${alias}.type`) : `${alias}.type`;
163
- return all([
164
- ...(scope.types === null ? [] : [fragment(`${type} IN ${list(scope.types).sql}`, scope.types)]),
165
- ...(scope.pathPrefix === null || scope.pathPrefix === ''
166
- ? []
167
- : [
168
- fragment(`${alias}.path >= ? AND ${alias}.path < ?`, [
169
- `${scope.pathPrefix}/`,
170
- `${scope.pathPrefix}0`,
171
- ]),
172
- ]),
173
- ...(scope.where === null ? [] : [conditioned(alias, scope.where)]),
60
+ ...(reach.areas.length === 0 ? [] : [fragment(`NOT ${grouped(outside).sql}`, outside.bind)]),
174
61
  ]);
175
62
  }
176
63
  function related(bound, plan) {
@@ -178,17 +65,17 @@ function related(bound, plan) {
178
65
  if (plan.hop !== null) {
179
66
  parts.push(exists(joined([
180
67
  fragment(`SELECT 1 FROM replica_links l JOIN replica_entries m ON m.key = d.key AND m.path = l.target AND ${VISIBLE('m')} WHERE l.doc = d.id AND l.kind = 'field' AND`),
181
- grouped(pointed('l', plan.hop.field, 'link')),
68
+ grouped(sql.placed('l', plan.hop.field, 'link')),
182
69
  fragment('AND'),
183
- grouped(all([scoped('m', plan.hop), reached(bound, 'm')])),
70
+ grouped(all([sql.scoped('m', plan.hop), reached(bound, 'm')])),
184
71
  ], ' ')));
185
72
  }
186
73
  if (plan.backlinks !== null) {
187
74
  const field = plan.backlinks.field;
188
75
  parts.push(exists(joined([
189
76
  fragment(`SELECT 1 FROM replica_links l JOIN replica_entries s ON s.id = l.doc AND ${VISIBLE('s')} WHERE l.key = d.key AND l.target = d.path AND l.kind = 'field' AND`),
190
- ...(field === null ? [] : [grouped(pointed('l', field, 'link')), fragment('AND')]),
191
- grouped(all([scoped('s', plan.backlinks), reached(bound, 's')])),
77
+ ...(field === null ? [] : [grouped(sql.placed('l', field, 'link')), fragment('AND')]),
78
+ grouped(all([sql.scoped('s', plan.backlinks), reached(bound, 's')])),
192
79
  ], ' ')));
193
80
  }
194
81
  return parts;
@@ -196,11 +83,9 @@ function related(bound, plan) {
196
83
  function filtered(bound, plan) {
197
84
  const keys = bound.rooms.map(({ key }) => key);
198
85
  return all([
199
- fragment(`d.key IN ${list(keys).sql} AND ${VISIBLE('d')}`, keys),
200
- ...(plan.paths === null ? [] : [fragment(`d.path IN ${list(plan.paths).sql}`, plan.paths)]),
201
- ...(plan.folder === null ? [] : [fragment('d.folder = ?', [plan.folder])]),
86
+ fragment(`d.key IN ${listed(keys).sql} AND ${VISIBLE('d')}`, keys),
202
87
  reached(bound, 'd'),
203
- scoped('d', plan.root, plan.paths !== null),
88
+ sql.tests('d', plan),
204
89
  ...related(bound, plan),
205
90
  ]);
206
91
  }
@@ -231,108 +116,65 @@ const GROUP_TIES = {
231
116
  locale: undefined,
232
117
  localeOptions: undefined,
233
118
  };
234
- function classOf(value, ordering) {
235
- if (value === null || value === undefined) {
236
- return { placement: ordering.nulls === 'first' ? 0 : 2, klass: 0, scalar: null };
237
- }
238
- if (typeof value === 'boolean')
239
- return { placement: 1, klass: 1, scalar: value ? 1 : 0 };
240
- if (typeof value === 'number')
241
- return { placement: 1, klass: 1, scalar: value };
242
- if (typeof value === 'string')
243
- return { placement: 1, klass: 2, scalar: value };
244
- return { placement: 1, klass: 3, scalar: JSON.stringify(value) };
245
- }
246
- function placement(term) {
247
- const nulls = term.ordering.nulls === 'first' ? 0 : 2;
248
- return fragment(`CASE WHEN ${term.kind.sql} IS NULL OR ${term.kind.sql} = 'null' THEN ${nulls} ELSE 1 END`, [...term.kind.bind, ...term.kind.bind]);
249
- }
250
- function klass(term) {
251
- return fragment(`CASE ${term.kind.sql} WHEN 'boolean' THEN 1 WHEN 'number' THEN 1 WHEN 'string' THEN 2 WHEN 'array' THEN 3 ELSE 4 END`, term.kind.bind);
252
- }
253
- function classed(term, which) {
254
- const kinds = which === 1 ? "('boolean', 'number')" : which === 2 ? "('string')" : "('array')";
255
- return fragment(`(CASE WHEN ${term.kind.sql} IN ${kinds} THEN ${term.value.sql} END)`, [
256
- ...term.kind.bind,
257
- ...term.value.bind,
258
- ]);
259
- }
260
- function collated(bound, term, which) {
261
- if (which === 1)
262
- return '';
263
- const name = bound.collate(term.ordering, which === 3, term.total === true);
264
- return name === null ? '' : ` COLLATE ${name}`;
265
- }
266
- function sorted(bound, term) {
267
- const direction = term.ordering.direction === 'desc' ? 'DESC' : 'ASC';
268
- return joined([
269
- placement(term),
270
- fragment(`${klass(term).sql} ${direction}`, klass(term).bind),
271
- ...[1, 2, 3].map((which) => {
272
- const value = classed(term, which);
273
- return fragment(`${value.sql}${collated(bound, term, which)} ${direction}`, value.bind);
274
- }),
275
- ], ', ');
276
- }
277
- function beyond(bound, term, value) {
278
- const held = classOf(value, term.ordering);
279
- const place = placement(term);
280
- if (held.placement !== 1) {
281
- return {
282
- beyond: fragment(`${place.sql} > ${held.placement}`, place.bind),
283
- equal: fragment(`${place.sql} = ${held.placement}`, place.bind),
284
- };
285
- }
286
- const after = term.ordering.direction === 'desc' ? '<' : '>';
287
- const kind = klass(term);
288
- const scalar = classed(term, held.klass);
289
- const collation = collated(bound, term, held.klass);
290
- return {
291
- beyond: any([
292
- fragment(`${place.sql} > 1`, place.bind),
293
- all([
294
- fragment(`${place.sql} = 1`, place.bind),
295
- any([
296
- fragment(`${kind.sql} ${after} ${held.klass}`, kind.bind),
297
- all([
298
- fragment(`${kind.sql} = ${held.klass}`, kind.bind),
299
- fragment(`${scalar.sql} ${after} ?${collation}`, [...scalar.bind, held.scalar]),
300
- ]),
301
- ]),
302
- ]),
303
- ]),
304
- equal: all([
305
- fragment(`${place.sql} = 1 AND ${kind.sql} = ${held.klass}`, [...place.bind, ...kind.bind]),
306
- fragment(`${scalar.sql} = ?${collation}`, [...scalar.bind, held.scalar]),
307
- ]),
308
- };
309
- }
310
- function following(parts, tie) {
311
- let condition = tie;
312
- for (const part of [...parts].reverse()) {
313
- condition = any([part.beyond, all([part.equal, condition])]);
314
- }
315
- return condition;
119
+ const GREATEST = { ...GROUP_ORDER, direction: 'desc', nulls: 'last' };
120
+ const TIMES = {
121
+ created: { value: 'd.created', instant: 'd.created_instant' },
122
+ updated: { value: "(d.change ->> '$.time')", instant: 'd.changed_instant' },
123
+ };
124
+ function subfolderOf(column, prefix) {
125
+ const root = prefix ?? '';
126
+ const base = root === '' ? '' : `${root}/`;
127
+ const rest = `substr(${column}, length(?) + 1)`;
128
+ return fragment(`(CASE WHEN ${column} = ? THEN NULL WHEN instr(${rest}, '/') = 0 THEN ${column} ELSE ? || substr(${rest}, 1, instr(${rest}, '/') - 1) END)`, [root, base, base, base, base]);
316
129
  }
317
- function keyTerm(bound, key, ordering, index) {
130
+ function keyTerm(key, ordering, index, prefix) {
318
131
  if (key.of === 'field') {
319
132
  const alias = `o${index}`;
320
133
  return {
321
- term: { ordering, kind: fragment(`${alias}.kind`), value: fragment(`${alias}.value`) },
134
+ term: {
135
+ ordering,
136
+ kind: fragment(`${alias}.kind`),
137
+ value: fragment(`${alias}.value`),
138
+ instant: fragment(`${alias}.instant`),
139
+ },
322
140
  join: joined([
323
141
  fragment(`LEFT JOIN replica_values ${alias} ON ${alias}.doc = d.id AND `),
324
- grouped(pointed(alias, key.field, 'exact')),
142
+ grouped(sql.placed(alias, key.field, 'exact')),
325
143
  fragment(` AND ${alias}.item = -1 AND ${alias}.kind NOT IN ('object', 'undefined')`),
326
144
  ], ''),
327
145
  };
328
146
  }
147
+ if (key.of === 'size') {
148
+ return {
149
+ term: {
150
+ ordering,
151
+ kind: fragment("(CASE WHEN d.bytes IS NULL THEN 'null' ELSE 'number' END)"),
152
+ value: fragment('d.bytes'),
153
+ },
154
+ join: null,
155
+ };
156
+ }
157
+ if (key.of === 'created' || key.of === 'updated') {
158
+ const { value, instant } = TIMES[key.of];
159
+ return {
160
+ term: {
161
+ ordering,
162
+ kind: fragment(`(CASE WHEN ${value} IS NULL THEN 'null' ELSE 'string' END)`),
163
+ value: fragment(value),
164
+ instant: fragment(instant),
165
+ },
166
+ join: null,
167
+ };
168
+ }
329
169
  const expression = key.of === 'room'
330
- ? located(bound, 'd')
170
+ ? located('d')
331
171
  : key.of === 'path'
332
172
  ? fragment('d.path')
333
173
  : key.of === 'type'
334
174
  ? fragment('d.type')
335
- : fragment('d.folder');
175
+ : key.of === 'subfolder'
176
+ ? subfolderOf('d.folder', prefix)
177
+ : fragment('d.folder');
336
178
  return {
337
179
  term: {
338
180
  ordering,
@@ -353,12 +195,20 @@ function decoded(kind, value) {
353
195
  return JSON.parse(value);
354
196
  return null;
355
197
  }
198
+ function sortedOf(kind, value, instant) {
199
+ return sql.sortValue(kind, decoded(kind, value), instant);
200
+ }
201
+ function sortedValue(row, index) {
202
+ return sortedOf(row[`k${index}`], row[`v${index}`], row[`i${index}`]);
203
+ }
356
204
  function decodedKey(key, row, index) {
357
- if (key.of === 'field') {
358
- const kind = row[`k${index}`];
359
- return kind === null || kind === undefined ? undefined : decoded(kind, row[`v${index}`]);
360
- }
361
- return row[`v${index}`] ?? null;
205
+ const kind = row[`k${index}`];
206
+ if (key.of === 'field' && (kind === null || kind === undefined))
207
+ return undefined;
208
+ return sortedValue(row, index);
209
+ }
210
+ function instantOf(term) {
211
+ return term.instant ?? fragment('NULL');
362
212
  }
363
213
  const registered = new WeakMap();
364
214
  function hashed(text) {
@@ -409,9 +259,6 @@ function collating(connection) {
409
259
  return name;
410
260
  };
411
261
  }
412
- function bodied(shape) {
413
- return shape.sections !== null || shape.preamble || shape.markdown;
414
- }
415
262
  function masked(pointers) {
416
263
  const root = { whole: false, members: new Map() };
417
264
  for (const pointer of pointers) {
@@ -480,8 +327,10 @@ function documentOf(shape, room, row, linked) {
480
327
  binaryFile: binaryRecord(path, binary, revision ?? undefined),
481
328
  }),
482
329
  ...(shape.markdown && content !== null ? { markdown: content } : {}),
330
+ ...(shape.change ? { change: changeOf(row) } : {}),
483
331
  ...(shape.fileId ? { fileId } : {}),
484
332
  ...(shape.revision ? { revision } : {}),
333
+ ...heldFacts(shape, row),
485
334
  };
486
335
  }
487
336
  const read = bodied(shape) ? parse(row.content, path) : null;
@@ -504,13 +353,19 @@ function documentOf(shape, room, row, linked) {
504
353
  ...(shape.preamble && body !== null ? { preamble: body.preamble } : {}),
505
354
  ...(shape.markdown ? { markdown: row.content } : {}),
506
355
  ...(shape.backlinks ? { backlinks: linked.get(documentKey(room, path)) ?? [] } : {}),
507
- ...(shape.change
508
- ? {
509
- change: row.change === null ? null : JSON.parse(row.change),
510
- }
511
- : {}),
356
+ ...(shape.change ? { change: changeOf(row) } : {}),
512
357
  ...(shape.fileId ? { fileId } : {}),
513
358
  ...(shape.revision ? { revision } : {}),
359
+ ...heldFacts(shape, row),
360
+ };
361
+ }
362
+ function changeOf(row) {
363
+ return row.change === null ? null : JSON.parse(row.change);
364
+ }
365
+ function heldFacts(shape, row) {
366
+ return {
367
+ ...(shape.size ? { size: row.bytes === null ? null : Number(row.bytes) } : {}),
368
+ ...(shape.created ? { created: row.created ?? null } : {}),
514
369
  };
515
370
  }
516
371
  function backlinksOf(connection, bound, rows) {
@@ -536,10 +391,10 @@ function backlinksOf(connection, bound, rows) {
536
391
  return linked;
537
392
  }
538
393
  function documents(connection, bound, plan, shape, budget) {
539
- const terms = shape.orderBy.map(({ key, options }, index) => keyTerm(bound, key, orderingOf(options), index));
394
+ const terms = shape.orderBy.map(({ key, options }, index) => keyTerm(key, orderingOf(options), index, plan.root.pathPrefix));
540
395
  const filter = filtered(bound, plan);
541
396
  const cursor = plan.after?.values ?? null;
542
- const room = located(bound, 'd');
397
+ const room = located('d');
543
398
  const tie = cursor === null
544
399
  ? null
545
400
  : (() => {
@@ -555,19 +410,20 @@ function documents(connection, bound, plan, shape, budget) {
555
410
  })();
556
411
  const after = cursor === null || tie === null
557
412
  ? null
558
- : following(terms.map(({ term }, index) => beyond(bound, term, cursor[index])), tie);
413
+ : sql.following(terms.map(({ term }, index) => sql.beyond(bound.collate, term, cursor[index])), tie);
559
414
  const selected = joined([
560
- fragment('SELECT d.id, d.key, d.path, d.type, d.binary, d.revision, d.fields, d.change, d.file_id'),
415
+ fragment('SELECT d.id, d.key, d.path, d.type, d.binary, d.revision, d.fields, d.change, d.file_id, d.bytes, d.created'),
561
416
  ...terms.map(({ term }, index) => joined([
562
417
  fragment(`, ${term.kind.sql} AS k${index}`, term.kind.bind),
563
418
  fragment(`, ${term.value.sql} AS v${index}`, term.value.bind),
419
+ fragment(`, ${instantOf(term).sql} AS i${index}`, instantOf(term).bind),
564
420
  ], '')),
565
421
  fragment(' FROM replica_entries d'),
566
422
  ...terms.flatMap(({ join }) => (join === null ? [] : [fragment(' '), join])),
567
423
  fragment(' WHERE '),
568
424
  after === null ? filter : all([filter, after]),
569
425
  fragment(' ORDER BY '),
570
- joined([...terms.map(({ term }) => sorted(bound, term)), room, fragment('d.path')], ', '),
426
+ joined([...terms.map(({ term }) => sql.sorted(bound.collate, term)), room, fragment('d.path')], ', '),
571
427
  ...(plan.limit === null ? [] : [fragment(' LIMIT ?', [plan.limit + 1])]),
572
428
  ], '');
573
429
  const rows = connection.rows(selected.sql, selected.bind);
@@ -606,7 +462,7 @@ function withContent(connection, rows, budget) {
606
462
  return rows;
607
463
  const ids = rows.map((row) => row.id);
608
464
  const sizes = new Map(connection
609
- .rows(`SELECT id, octet_length(content) AS size FROM replica_entries WHERE id IN ${list(ids).sql}`, ids)
465
+ .rows(`SELECT id, octet_length(content) AS size FROM replica_entries WHERE id IN ${listed(ids).sql}`, ids)
610
466
  .map((row) => [row.id, Number(row.size ?? 0)]));
611
467
  let cut = rows.length;
612
468
  let spent = 0;
@@ -621,88 +477,169 @@ function withContent(connection, rows, budget) {
621
477
  const kept = rows.slice(0, cut);
622
478
  const read = kept.map((row) => row.id);
623
479
  const held = new Map(connection
624
- .rows(`SELECT id, content FROM replica_entries WHERE id IN ${list(read).sql}`, read)
480
+ .rows(`SELECT id, content FROM replica_entries WHERE id IN ${listed(read).sql}`, read)
625
481
  .map((row) => [row.id, row.content]));
626
482
  return kept.map((row) => ({ ...row, content: held.get(row.id) ?? null }));
627
483
  }
628
- function storedFolders(bound, plan) {
629
- if (plan.paths !== null || plan.hop !== null || plan.backlinks !== null)
484
+ function storedFolders(bound, plan, subfolder) {
485
+ if (plan.paths !== null || plan.fileIds !== null)
486
+ return null;
487
+ if (plan.hop !== null || plan.backlinks !== null)
488
+ return null;
489
+ if (subfolder && plan.folder !== null)
630
490
  return null;
631
491
  const whole = bound.rooms.filter(({ locator }) => bound.reach === null || bound.reach.rooms.includes(locator));
632
492
  if (whole.length === 0)
633
493
  return null;
634
494
  const keys = whole.map(({ key }) => key);
635
- const prefix = plan.root.pathPrefix;
636
- const fenced = (bound.reach?.areas ?? []).flatMap((area) => {
495
+ const prefix = plan.root.pathPrefix ?? '';
496
+ const outside = (bound.reach?.areas ?? []).flatMap((area) => {
637
497
  const key = bound.keys.get(area.room);
638
- return key === undefined
639
- ? []
640
- : [
641
- fragment('NOT (f.key = ? AND (f.path = ? OR (f.path >= ? AND f.path < ?)))', [
642
- key,
643
- area.path,
644
- `${area.path}/`,
645
- `${area.path}0`,
646
- ]),
647
- ];
498
+ if (key === undefined)
499
+ return [];
500
+ const fence = fenced('f', key, area, true);
501
+ return [fragment(`NOT ${grouped(fence).sql}`, fence.bind)];
648
502
  });
503
+ const under = prefix === ''
504
+ ? subfolder
505
+ ? [fragment("f.path <> ''")]
506
+ : []
507
+ : [
508
+ subfolder
509
+ ? fragment('(f.path >= ? AND f.path < ?)', [`${prefix}/`, `${prefix}0`])
510
+ : within('f', prefix),
511
+ ];
649
512
  return all([
650
- fragment(`f.key IN ${list(keys).sql} AND f.layer = 0 AND f.present = 1`, keys),
651
- ...fenced,
652
- ...(prefix === null || prefix === ''
653
- ? []
654
- : [
655
- fragment('(f.path = ? OR (f.path >= ? AND f.path < ?))', [
656
- prefix,
657
- `${prefix}/`,
658
- `${prefix}0`,
659
- ]),
660
- ]),
513
+ fragment(`f.key IN ${listed(keys).sql} AND f.layer = 0 AND f.present = 1`, keys),
514
+ ...outside,
515
+ ...under,
516
+ ...(plan.outside ?? []).map((folder) => fragment(`NOT ${within('f', folder).sql}`, within('f', folder).bind)),
661
517
  ...(plan.folder === null ? [] : [fragment('f.path = ?', [plan.folder])]),
662
518
  ]);
663
519
  }
520
+ const SIZES = [
521
+ 'CASE WHEN d.binary IS NULL THEN 1 ELSE 0 END AS dn',
522
+ 'CASE WHEN d.binary IS NULL THEN d.bytes ELSE 0 END AS ds',
523
+ 'CASE WHEN d.binary IS NULL THEN 0 ELSE 1 END AS fn',
524
+ 'CASE WHEN d.binary IS NULL THEN 0 ELSE d.bytes END AS fs',
525
+ ];
526
+ const LATEST = "d.changed_instant || ' ' || (d.change ->> '$.time') AS u";
527
+ function greatestTerm(ordering) {
528
+ return { ordering, kind: fragment('gk'), value: fragment('gv'), instant: fragment('gi') };
529
+ }
530
+ function latestOf(held) {
531
+ if (typeof held !== 'string')
532
+ return null;
533
+ return held.slice(held.indexOf(' ') + 1);
534
+ }
664
535
  function groups(connection, bound, plan, shape) {
536
+ const prefix = plan.root.pathPrefix;
665
537
  const keyed = shape.groupBy.map((key, index) => {
666
- const { term, join } = keyTerm(bound, key, GROUP_ORDER, index);
538
+ const { term, join } = keyTerm(key, GROUP_ORDER, index, prefix);
667
539
  const kind = fragment(`COALESCE(${term.kind.sql}, 'null')`, term.kind.bind);
668
540
  return { term: { ...term, kind }, join };
669
541
  });
542
+ const ordering = shape.orderBy.map(({ by }) => by);
543
+ const sized = shape.size || ordering.includes('size');
544
+ const dated = shape.updated || ordering.includes('updated');
545
+ const greatest = shape.greatest === null
546
+ ? null
547
+ : keyTerm({ of: 'field', field: shape.greatest }, GREATEST, keyed.length, prefix);
670
548
  const filter = filtered(bound, plan);
671
549
  const inner = joined([
672
550
  fragment('SELECT '),
673
551
  joined(keyed.map(({ term }, index) => joined([
674
552
  fragment(`${term.kind.sql} AS k${index}`, term.kind.bind),
675
553
  fragment(`, ${term.value.sql} AS v${index}`, term.value.bind),
554
+ fragment(`, ${instantOf(term).sql} AS i${index}`, instantOf(term).bind),
676
555
  ], '')), ', '),
677
- fragment(', 1 AS n FROM replica_entries d'),
678
- ...keyed.flatMap(({ join }) => (join === null ? [] : [fragment(' '), join])),
556
+ fragment(['', '1 AS n', ...(sized ? SIZES : []), ...(dated ? [LATEST] : [])].join(', ')),
557
+ ...(greatest === null
558
+ ? []
559
+ : [
560
+ fragment(`, ${greatest.term.kind.sql} AS gk`, greatest.term.kind.bind),
561
+ fragment(`, ${greatest.term.value.sql} AS gv`, greatest.term.value.bind),
562
+ fragment(`, ${instantOf(greatest.term).sql} AS gi`, instantOf(greatest.term).bind),
563
+ ]),
564
+ fragment(' FROM replica_entries d'),
565
+ ...[...keyed, ...(greatest === null ? [] : [greatest])].flatMap(({ join }) => join === null ? [] : [fragment(' '), join]),
679
566
  fragment(' WHERE '),
680
567
  filter,
681
568
  ], '');
682
- const folders = shape.groupBy.length === 1 && shape.groupBy[0].of === 'folder'
683
- ? storedFolders(bound, plan)
684
- : null;
569
+ const only = shape.groupBy.length === 1 ? shape.groupBy[0].of : null;
570
+ const subfolder = only === 'subfolder';
571
+ const folders = only === 'folder' || subfolder ? storedFolders(bound, plan, subfolder) : null;
572
+ const folderKey = subfolder ? subfolderOf('f.path', prefix) : fragment('f.path');
573
+ const zeros = [
574
+ ...(sized ? ['0', '0', '0', '0'] : []),
575
+ ...(dated ? ['NULL'] : []),
576
+ ...(greatest === null ? [] : ['NULL', 'NULL', 'NULL']),
577
+ ];
685
578
  const source = folders === null
686
579
  ? inner
687
580
  : joined([
688
581
  inner,
689
- fragment(" UNION ALL SELECT 'string' AS k0, f.path AS v0, 0 AS n FROM replica_folders f WHERE "),
582
+ fragment(` UNION ALL SELECT 'string' AS k0, ${folderKey.sql} AS v0, NULL AS i0, 0 AS n${zeros.map((one) => `, ${one}`).join('')} FROM replica_folders f WHERE `, folderKey.bind),
690
583
  folders,
691
584
  ], '');
692
- const columns = keyed.map((_, index) => `k${index}, v${index}`).join(', ');
693
- const counted = {
694
- ordering: { ...GROUP_ORDER },
695
- kind: fragment("'number'"),
696
- value: fragment('n'),
697
- };
698
- const outer = (index, ordering) => ({
699
- ordering,
585
+ const held = keyed
586
+ .map((_, index) => `k${index}, i${index}, CASE WHEN i${index} IS NULL THEN v${index} END`)
587
+ .join(', ');
588
+ const ranked = greatest === null
589
+ ? source
590
+ : joined([
591
+ fragment(`SELECT *, ROW_NUMBER() OVER (PARTITION BY ${held} ORDER BY `),
592
+ sql.sorted(bound.collate, greatestTerm(GREATEST)),
593
+ fragment(', gv) AS gr FROM ('),
594
+ source,
595
+ fragment(')'),
596
+ ], '');
597
+ const columns = [
598
+ ...keyed.map((_, index) => `k${index}, min(v${index}) AS v${index}, i${index}`),
599
+ 'sum(n) AS n',
600
+ ...(sized ? ['sum(dn) AS dn', 'sum(ds) AS ds', 'sum(fn) AS fn', 'sum(fs) AS fs'] : []),
601
+ ...(dated ? ['max(u) AS u'] : []),
602
+ ...(greatest === null
603
+ ? []
604
+ : ['gk', 'gv', 'gi'].map((column) => `min(CASE WHEN gr = 1 THEN ${column} END) AS ${column}`)),
605
+ ].join(', ');
606
+ const outer = (index, order) => ({
607
+ ordering: order,
700
608
  kind: fragment(`k${index}`),
701
609
  value: fragment(`v${index}`),
702
610
  });
703
- const ordered = shape.orderBy.map(({ by, direction }) => by === 'count'
704
- ? { ...counted, ordering: { ...GROUP_ORDER, direction } }
705
- : outer(by, { ...GROUP_ORDER, direction }));
611
+ const termOf = (by, order) => {
612
+ if (by === 'count')
613
+ return { ordering: order, kind: fragment("'number'"), value: fragment('n') };
614
+ if (by === 'size') {
615
+ return { ordering: order, kind: fragment("'number'"), value: fragment('(ds + fs)') };
616
+ }
617
+ if (by === 'updated') {
618
+ return {
619
+ ordering: order,
620
+ kind: fragment("(CASE WHEN u IS NULL THEN 'null' ELSE 'string' END)"),
621
+ value: fragment("substr(u, instr(u, ' ') + 1)"),
622
+ instant: fragment("substr(u, 1, instr(u, ' ') - 1)"),
623
+ };
624
+ }
625
+ if (by === 'greatest')
626
+ return greatestTerm(order);
627
+ return { ...outer(by, order), instant: fragment(`i${by}`) };
628
+ };
629
+ const valueOf = (row, by) => {
630
+ if (by === 'count')
631
+ return Number(row.n);
632
+ if (by === 'size')
633
+ return Number(row.ds) + Number(row.fs);
634
+ if (by === 'updated') {
635
+ const text = latestOf(row.u);
636
+ return text === null ? null : sql.sortValue('string', text, row.u.split(' ')[0]);
637
+ }
638
+ if (by === 'greatest')
639
+ return sortedOf(row.gk, row.gv, row.gi);
640
+ return sortedValue(row, by);
641
+ };
642
+ const ordered = shape.orderBy.map(({ by, direction, nulls }) => termOf(by, { ...GROUP_ORDER, direction, nulls: nulls ?? GROUP_ORDER.nulls }));
706
643
  const ties = keyed.flatMap((_, index) => [
707
644
  { ...outer(index, GROUP_TIES), total: true },
708
645
  { ordering: GROUP_TIES, kind: fragment("'string'"), value: fragment(`k${index}`) },
@@ -712,34 +649,44 @@ function groups(connection, bound, plan, shape) {
712
649
  ? null
713
650
  : cursor[shape.orderBy.length].flatMap((value) => [
714
651
  value,
715
- kindOf(value ?? null),
652
+ heldKind(value ?? null),
716
653
  ]);
717
654
  const after = cursor === null || tieValues === null
718
655
  ? null
719
- : following(ordered.map((term, index) => beyond(bound, term, cursor[index])), following(ties.slice(0, -1).map((term, index) => beyond(bound, term, tieValues[index])), beyond(bound, ties.at(-1), tieValues.at(-1)).beyond));
720
- const grouping = joined([fragment(`SELECT ${columns}, sum(n) AS n FROM (`), source, fragment(`) GROUP BY ${columns}`)], '');
656
+ : sql.following(ordered.map((term, index) => sql.beyond(bound.collate, term, cursor[index])), sql.following(ties
657
+ .slice(0, -1)
658
+ .map((term, index) => sql.beyond(bound.collate, term, tieValues[index])), sql.beyond(bound.collate, ties.at(-1), tieValues.at(-1)).beyond));
659
+ const grouping = joined([fragment(`SELECT ${columns} FROM (`), ranked, fragment(`) GROUP BY ${held}`)], '');
721
660
  const windowed = joined([
722
661
  fragment('SELECT * FROM ('),
723
662
  grouping,
724
663
  fragment(')'),
725
664
  ...(after === null ? [] : [fragment(' WHERE '), after]),
726
665
  fragment(' ORDER BY '),
727
- joined([...ordered, ...ties].map((term) => sorted(bound, term)), ', '),
666
+ joined([...ordered, ...ties].map((term) => sql.sorted(bound.collate, term)), ', '),
728
667
  ...(plan.limit === null ? [] : [fragment(' LIMIT ?', [plan.limit + 1])]),
729
668
  ], '');
730
669
  const rows = connection.rows(windowed.sql, windowed.bind);
731
670
  const kept = plan.limit === null ? rows : rows.slice(0, plan.limit);
732
671
  const keyOf = (row) => keyed.map((_, index) => decoded(row[`k${index}`], row[`v${index}`]));
733
- const found = kept.map((row) => ({ key: keyOf(row), count: Number(row.n) }));
672
+ const found = kept.map((row) => ({
673
+ key: keyOf(row),
674
+ count: Number(row.n),
675
+ ...(shape.size
676
+ ? {
677
+ documents: { count: Number(row.dn), size: Number(row.ds) },
678
+ files: { count: Number(row.fn), size: Number(row.fs) },
679
+ }
680
+ : {}),
681
+ ...(shape.updated ? { updated: latestOf(row.u) } : {}),
682
+ ...(shape.greatest === null ? {} : { greatest: decoded(row.gk, row.gv) }),
683
+ }));
734
684
  const last = kept.at(-1);
735
685
  const next = plan.limit === null || rows.length <= plan.limit
736
686
  ? undefined
737
687
  : last === undefined
738
688
  ? (plan.after?.text ?? FROM_START)
739
- : cursorOf([
740
- ...shape.orderBy.map(({ by }) => by === 'count' ? Number(last.n) : decoded(last[`k${by}`], last[`v${by}`])),
741
- keyOf(last),
742
- ]);
689
+ : cursorOf([...shape.orderBy.map(({ by }) => valueOf(last, by)), keyOf(last)]);
743
690
  const total = plan.total
744
691
  ? Number(connection.rows(joined([fragment('SELECT count(*) AS held FROM ('), grouping, fragment(')')], '').sql, grouping.bind)[0].held)
745
692
  : undefined;
@@ -757,9 +704,6 @@ function boundOf(connection, plan, rooms) {
757
704
  collate: collating(connection),
758
705
  };
759
706
  }
760
- export function selected(connection, plan, rooms) {
761
- return filtered(boundOf(connection, plan, rooms), plan);
762
- }
763
707
  export function answerQuery(connection, plan, rooms, budget = null) {
764
708
  const bound = boundOf(connection, plan, rooms);
765
709
  if (rooms.length === 0) {