@agentshouse/mdruntime 0.1.0-c08b314dc5105 → 0.1.0-c09bf842921ff

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 (137) hide show
  1. package/README.md +1 -1
  2. package/dist/adapter.d.ts +72 -56
  3. package/dist/adapter.d.ts.map +1 -1
  4. package/dist/attached-model.d.ts +3 -10
  5. package/dist/attached-model.d.ts.map +1 -1
  6. package/dist/attached-model.js +29 -47
  7. package/dist/bootstrap.d.ts +9 -16
  8. package/dist/bootstrap.d.ts.map +1 -1
  9. package/dist/bootstrap.js +85 -109
  10. package/dist/chain.d.ts +2 -1
  11. package/dist/chain.d.ts.map +1 -1
  12. package/dist/client.d.ts +9 -5
  13. package/dist/client.d.ts.map +1 -1
  14. package/dist/client.js +2 -1
  15. package/dist/collection.d.ts +2 -4
  16. package/dist/collection.d.ts.map +1 -1
  17. package/dist/collection.js +1 -17
  18. package/dist/compile.d.ts +1 -6
  19. package/dist/compile.d.ts.map +1 -1
  20. package/dist/compile.js +91 -270
  21. package/dist/connection.d.ts +9 -9
  22. package/dist/connection.d.ts.map +1 -1
  23. package/dist/connection.js +965 -1050
  24. package/dist/context.d.ts +2 -0
  25. package/dist/context.d.ts.map +1 -0
  26. package/dist/context.js +7 -0
  27. package/dist/conversation.d.ts +16 -13
  28. package/dist/conversation.d.ts.map +1 -1
  29. package/dist/conversation.js +229 -155
  30. package/dist/durability.d.ts +6 -1
  31. package/dist/durability.d.ts.map +1 -1
  32. package/dist/entry.d.ts +3 -2
  33. package/dist/entry.d.ts.map +1 -1
  34. package/dist/entry.js +17 -8
  35. package/dist/host.d.ts +3 -7
  36. package/dist/host.d.ts.map +1 -1
  37. package/dist/host.js +22 -27
  38. package/dist/identity.d.ts +0 -1
  39. package/dist/identity.d.ts.map +1 -1
  40. package/dist/identity.js +0 -3
  41. package/dist/index.d.ts +11 -7
  42. package/dist/index.d.ts.map +1 -1
  43. package/dist/index.js +4 -1
  44. package/dist/job.d.ts +14 -0
  45. package/dist/job.d.ts.map +1 -0
  46. package/dist/job.js +28 -0
  47. package/dist/live.d.ts +2 -1
  48. package/dist/live.d.ts.map +1 -1
  49. package/dist/live.js +10 -7
  50. package/dist/media.d.ts +1 -1
  51. package/dist/media.d.ts.map +1 -1
  52. package/dist/media.js +27 -14
  53. package/dist/memory.d.ts +11 -5
  54. package/dist/memory.d.ts.map +1 -1
  55. package/dist/memory.js +166 -83
  56. package/dist/messages.d.ts +2 -2
  57. package/dist/messages.d.ts.map +1 -1
  58. package/dist/messages.js +15 -16
  59. package/dist/model.d.ts +2 -8
  60. package/dist/model.d.ts.map +1 -1
  61. package/dist/model.js +0 -12
  62. package/dist/observation.d.ts +2 -2
  63. package/dist/observation.d.ts.map +1 -1
  64. package/dist/observation.js +7 -2
  65. package/dist/outcome.d.ts +0 -3
  66. package/dist/outcome.d.ts.map +1 -1
  67. package/dist/paths.d.ts +1 -0
  68. package/dist/paths.d.ts.map +1 -1
  69. package/dist/paths.js +4 -0
  70. package/dist/query.d.ts +4 -209
  71. package/dist/query.d.ts.map +1 -1
  72. package/dist/query.js +3 -505
  73. package/dist/reach.d.ts +9 -8
  74. package/dist/reach.d.ts.map +1 -1
  75. package/dist/reach.js +37 -48
  76. package/dist/react.d.ts +3 -1
  77. package/dist/react.d.ts.map +1 -1
  78. package/dist/readiness.d.ts +3 -17
  79. package/dist/readiness.d.ts.map +1 -1
  80. package/dist/readiness.js +4 -10
  81. package/dist/recovery.d.ts +1 -0
  82. package/dist/recovery.d.ts.map +1 -1
  83. package/dist/recovery.js +26 -0
  84. package/dist/refresh.d.ts +7 -5
  85. package/dist/refresh.d.ts.map +1 -1
  86. package/dist/refresh.js +29 -5
  87. package/dist/replica.d.ts +9 -7
  88. package/dist/replica.d.ts.map +1 -1
  89. package/dist/replica.js +27 -13
  90. package/dist/room-draft.d.ts +21 -5
  91. package/dist/room-draft.d.ts.map +1 -1
  92. package/dist/room-draft.js +98 -51
  93. package/dist/rows.d.ts +14 -21
  94. package/dist/rows.d.ts.map +1 -1
  95. package/dist/rows.js +48 -184
  96. package/dist/save.d.ts +2 -0
  97. package/dist/save.d.ts.map +1 -1
  98. package/dist/save.js +12 -6
  99. package/dist/search.d.ts +12 -63
  100. package/dist/search.d.ts.map +1 -1
  101. package/dist/search.js +9 -52
  102. package/dist/shared.d.ts +0 -1
  103. package/dist/shared.d.ts.map +1 -1
  104. package/dist/shared.js +0 -10
  105. package/dist/status.d.ts +4 -3
  106. package/dist/status.d.ts.map +1 -1
  107. package/dist/status.js +3 -1
  108. package/dist/store.d.ts +15 -36
  109. package/dist/store.d.ts.map +1 -1
  110. package/dist/store.js +26 -81
  111. package/dist/stored.d.ts +7 -30
  112. package/dist/stored.d.ts.map +1 -1
  113. package/dist/stored.js +142 -189
  114. package/dist/tables.d.ts +19 -46
  115. package/dist/tables.d.ts.map +1 -1
  116. package/dist/tables.js +29 -66
  117. package/dist/transfer.d.ts +0 -5
  118. package/dist/transfer.d.ts.map +1 -1
  119. package/dist/validation.d.ts +3 -4
  120. package/dist/validation.d.ts.map +1 -1
  121. package/dist/validation.js +42 -100
  122. package/dist/windows.d.ts +1 -12
  123. package/dist/windows.d.ts.map +1 -1
  124. package/dist/windows.js +2 -75
  125. package/dist/wire.d.ts +9 -4
  126. package/dist/wire.d.ts.map +1 -1
  127. package/dist/wire.js +3 -1
  128. package/package.json +2 -2
  129. package/dist/fulltext.d.ts +0 -27
  130. package/dist/fulltext.d.ts.map +0 -1
  131. package/dist/fulltext.js +0 -368
  132. package/dist/reads.d.ts +0 -11
  133. package/dist/reads.d.ts.map +0 -1
  134. package/dist/reads.js +0 -100
  135. package/dist/words.d.ts +0 -19
  136. package/dist/words.d.ts.map +0 -1
  137. package/dist/words.js +0 -150
package/dist/stored.js CHANGED
@@ -1,24 +1,21 @@
1
+ import { sql } from '@agentshouse/mdmodel';
1
2
  import { composedOf } from './collection.js';
2
- import { indexDocument, unindexAll, unindexDocuments } from './fulltext.js';
3
- import { described, derived } from './rows.js';
3
+ import { described, derived, heldOf } from './rows.js';
4
4
  export const REPLICA_TABLES = [
5
- 'CREATE TABLE replica_keys (key INTEGER PRIMARY KEY AUTOINCREMENT, locator TEXT NOT NULL, transfer TEXT NOT NULL, fingerprint TEXT NOT NULL, rederiving INTEGER, searching INTEGER)',
5
+ 'CREATE TABLE replica_keys (key INTEGER PRIMARY KEY AUTOINCREMENT, locator TEXT NOT NULL, transfer TEXT NOT NULL, fingerprint TEXT NOT NULL, rederiving INTEGER)',
6
6
  'CREATE TABLE replica_rooms (locator TEXT PRIMARY KEY, key INTEGER NOT NULL, record TEXT NOT NULL) WITHOUT ROWID',
7
- 'CREATE TABLE replica_transfers (locator TEXT PRIMARY KEY, key INTEGER NOT NULL, record TEXT NOT NULL) WITHOUT ROWID',
8
- 'CREATE TABLE replica_transfer_parts (locator TEXT NOT NULL, token TEXT NOT NULL, part BLOB NOT NULL)',
9
- 'CREATE INDEX replica_transfer_parts_locator ON replica_transfer_parts (locator)',
10
- 'CREATE TABLE replica_entries (id INTEGER PRIMARY KEY, key INTEGER NOT NULL, layer INTEGER NOT NULL, path TEXT NOT NULL, visible INTEGER NOT NULL, present INTEGER NOT NULL, queried INTEGER NOT NULL, binary TEXT, revision TEXT, file_id TEXT, change TEXT, written TEXT, type TEXT, declared TEXT, folder TEXT NOT NULL, fields TEXT, content TEXT)',
7
+ 'CREATE TABLE replica_models (identity TEXT NOT NULL, version TEXT NOT NULL, schema TEXT NOT NULL, PRIMARY KEY (identity, version)) WITHOUT ROWID',
8
+ 'CREATE TABLE replica_entries (id INTEGER PRIMARY KEY, key INTEGER NOT NULL, layer INTEGER NOT NULL, path TEXT NOT NULL, visible INTEGER NOT NULL, present INTEGER NOT NULL, queried INTEGER NOT NULL, binary TEXT, revision TEXT, file_id TEXT, change TEXT, written TEXT, type TEXT, declared TEXT, folder TEXT NOT NULL, fields TEXT, links TEXT, content TEXT)',
11
9
  'CREATE UNIQUE INDEX replica_entries_path ON replica_entries (key, layer, path)',
12
10
  'CREATE INDEX replica_entries_visible ON replica_entries (key, visible, present, path, binary)',
13
11
  'CREATE INDEX replica_entries_folder ON replica_entries (key, folder, path)',
14
- 'CREATE TABLE replica_values (doc INTEGER NOT NULL, key INTEGER NOT NULL, keys TEXT NOT NULL, places TEXT NOT NULL, item INTEGER NOT NULL, kind TEXT NOT NULL, value, size INTEGER, PRIMARY KEY (doc, keys, places, item)) WITHOUT ROWID',
15
- 'CREATE INDEX replica_values_lookup ON replica_values (key, keys, kind, value)',
12
+ 'CREATE INDEX replica_entries_type ON replica_entries (key, type, visible, present, queried, folder)',
13
+ 'CREATE INDEX replica_entries_key ON replica_entries (key)',
14
+ sql.VALUE_TABLE,
16
15
  'CREATE TABLE replica_links (doc INTEGER NOT NULL, key INTEGER NOT NULL, kind TEXT NOT NULL, keys TEXT NOT NULL, places TEXT NOT NULL, target TEXT NOT NULL, field TEXT NOT NULL, PRIMARY KEY (doc, kind, keys, places, target)) WITHOUT ROWID',
17
16
  'CREATE INDEX replica_links_target ON replica_links (key, target, kind, keys)',
18
17
  'CREATE TABLE replica_folders (key INTEGER NOT NULL, layer INTEGER NOT NULL, path TEXT NOT NULL, present INTEGER NOT NULL, PRIMARY KEY (key, layer, path)) WITHOUT ROWID',
19
18
  'CREATE TABLE replica_erasing (key INTEGER PRIMARY KEY, locator TEXT NOT NULL)',
20
- 'CREATE TABLE replica_received (key TEXT PRIMARY KEY, head TEXT NOT NULL) WITHOUT ROWID',
21
- 'CREATE TABLE replica_received_parts (key TEXT NOT NULL, part INTEGER NOT NULL, value TEXT NOT NULL, PRIMARY KEY (key, part)) WITHOUT ROWID',
22
19
  'CREATE TABLE replica_facts (name TEXT PRIMARY KEY, value TEXT NOT NULL) WITHOUT ROWID',
23
20
  'CREATE TABLE replica_presentation (app TEXT PRIMARY KEY, value TEXT NOT NULL) WITHOUT ROWID',
24
21
  ];
@@ -33,8 +30,7 @@ const ABSENT = {
33
30
  queried: false,
34
31
  folder: '',
35
32
  fields: null,
36
- values: [],
37
- links: [],
33
+ links: null,
38
34
  };
39
35
  function text(value) {
40
36
  return typeof value === 'string' ? value : null;
@@ -55,12 +51,18 @@ function dropDerived(connection, doc) {
55
51
  connection.run('DELETE FROM replica_values WHERE doc = ?', [doc]);
56
52
  connection.run('DELETE FROM replica_links WHERE doc = ?', [doc]);
57
53
  }
58
- function writeDerived(connection, doc, key, made) {
59
- for (const value of made.values) {
60
- connection.run('INSERT INTO replica_values (doc, key, keys, places, item, kind, value, size) VALUES (?, ?, ?, ?, ?, ?, ?, ?)', [doc, key, value.keys, value.places, value.item, value.kind, value.value, value.size]);
54
+ function writeDerived(connection, doc, key, path, held, composition) {
55
+ const made = derived(path, held, composition);
56
+ if (made.values.length > 0) {
57
+ const inserted = sql.insertedValues(doc, made.values);
58
+ connection.run(inserted.sql, inserted.bind);
61
59
  }
62
- for (const link of made.links) {
63
- connection.run('INSERT OR IGNORE INTO replica_links (doc, key, kind, keys, places, target, field) VALUES (?, ?, ?, ?, ?, ?, ?)', [doc, key, link.kind, link.keys, link.places, link.target, link.field]);
60
+ if (made.links.length > 0) {
61
+ connection.run('INSERT OR IGNORE INTO replica_links (doc, key, kind, keys, places, target, field) SELECT ?, ?, value ->> 0, value ->> 1, value ->> 2, value ->> 3, value ->> 4 FROM json_each(?)', [
62
+ doc,
63
+ key,
64
+ JSON.stringify(made.links.map((link) => [link.kind, link.keys, link.places, link.target, link.field])),
65
+ ]);
64
66
  }
65
67
  }
66
68
  function entryId(connection, key, layer, path) {
@@ -72,14 +74,10 @@ function removeEntry(connection, key, layer, path) {
72
74
  if (id === null)
73
75
  return;
74
76
  dropDerived(connection, id);
75
- unindexDocuments(connection, [id]);
76
77
  connection.run('DELETE FROM replica_entries WHERE id = ?', [id]);
77
78
  }
78
- function heldIds(connection, sql, bind) {
79
- return connection.rows(sql, bind).map((row) => number(row.id));
80
- }
81
79
  function insertEntry(connection, key, layer, entry, present, made) {
82
- connection.run('INSERT INTO replica_entries (key, layer, path, visible, present, queried, content, binary, revision, file_id, change, written, type, declared, folder, fields) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', [
80
+ connection.run('INSERT INTO replica_entries (key, layer, path, visible, present, queried, content, binary, revision, file_id, change, written, type, declared, folder, fields, links) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', [
83
81
  key,
84
82
  layer,
85
83
  entry.path,
@@ -96,27 +94,24 @@ function insertEntry(connection, key, layer, entry, present, made) {
96
94
  made.declared,
97
95
  made.folder,
98
96
  made.fields,
97
+ made.links,
99
98
  ]);
100
99
  }
101
100
  function textOf(entry) {
102
101
  return entry.binary === null ? entry.content : null;
103
102
  }
104
- function putEntry(connection, key, layer, entry, present, composition, searched = true) {
103
+ function putEntry(connection, key, layer, entry, present, composition) {
105
104
  removeEntry(connection, key, layer, entry.path);
106
105
  const content = textOf(entry);
107
- const made = present ? derived(entry.path, content, composition) : ABSENT;
108
- insertEntry(connection, key, layer, entry, present, made);
106
+ insertEntry(connection, key, layer, entry, present, present ? described(entry.path, content, entry.facts) : ABSENT);
109
107
  if (!present)
110
108
  return;
111
109
  const id = entryId(connection, key, layer, entry.path);
112
- writeDerived(connection, id, key, made);
113
- if (searched && content !== null && made.queried) {
114
- indexDocument(connection, id, entry.path, content);
115
- }
110
+ writeDerived(connection, id, key, entry.path, heldOf(entry.path, content, entry.facts), composition);
116
111
  }
117
112
  function placeEntry(connection, key, entry) {
118
113
  removeEntry(connection, key, CONFIRMED, entry.path);
119
- insertEntry(connection, key, CONFIRMED, entry, true, described(entry.path, textOf(entry)));
114
+ insertEntry(connection, key, CONFIRMED, entry, true, described(entry.path, textOf(entry), entry.facts));
120
115
  }
121
116
  function revealed(connection, key, touched) {
122
117
  if (touched.length === 0)
@@ -125,7 +120,7 @@ function revealed(connection, key, touched) {
125
120
  }
126
121
  function newKey(connection, locator, transfer, fingerprint, built) {
127
122
  const owed = built ? null : 0;
128
- connection.run('INSERT INTO replica_keys (locator, transfer, fingerprint, rederiving, searching) VALUES (?, ?, ?, ?, ?)', [locator, transfer, fingerprint, owed, owed]);
123
+ connection.run('INSERT INTO replica_keys (locator, transfer, fingerprint, rederiving) VALUES (?, ?, ?, ?)', [locator, transfer, fingerprint, owed]);
129
124
  const [row] = connection.rows('SELECT last_insert_rowid() AS key');
130
125
  return number(row.key);
131
126
  }
@@ -139,30 +134,14 @@ function recomposed(connection, key, fingerprint) {
139
134
  export function entered(connection, locator, composition, rows) {
140
135
  const key = newKey(connection, locator, '', composedOf(composition).fingerprint, true);
141
136
  for (const entry of rows)
142
- putEntry(connection, key, CONFIRMED, entry, true, composition, false);
137
+ putEntry(connection, key, CONFIRMED, entry, true, composition);
143
138
  return key;
144
139
  }
145
- function dropTransfer(connection, locator) {
146
- connection.run('DELETE FROM replica_transfers WHERE locator = ?', [locator]);
147
- connection.run('DELETE FROM replica_transfer_parts WHERE locator = ?', [locator]);
148
- }
149
140
  export function stage(connection, request) {
150
- const [held] = connection.rows('SELECT key FROM replica_transfers WHERE locator = ?', [
151
- request.locator,
152
- ]);
153
141
  const key = request.key ??
154
- (held === undefined
155
- ? newKey(connection, request.locator, request.transfer, request.fingerprint, false)
156
- : number(held.key));
142
+ newKey(connection, request.locator, request.transfer, request.fingerprint, false);
157
143
  recomposed(connection, key, request.fingerprint);
158
- connection.run('UPDATE replica_keys SET rederiving = coalesce(rederiving, last), searching = coalesce(searching, last) FROM (SELECT coalesce(max(id), 0) AS last FROM replica_entries) WHERE key = ?', [key]);
159
- connection.run('INSERT OR REPLACE INTO replica_transfers (locator, key, record) VALUES (?, ?, ?)', [request.locator, key, request.record]);
160
- if (request.written !== undefined) {
161
- connection.run('DELETE FROM replica_transfer_parts WHERE locator = ? AND token = ?', [
162
- request.locator,
163
- request.written,
164
- ]);
165
- }
144
+ connection.run('UPDATE replica_keys SET rederiving = coalesce(rederiving, last) FROM (SELECT coalesce(max(id), 0) AS last FROM replica_entries) WHERE key = ?', [key]);
166
145
  for (const entry of request.entries)
167
146
  placeEntry(connection, key, entry);
168
147
  for (const path of request.folders) {
@@ -171,7 +150,7 @@ export function stage(connection, request) {
171
150
  return key;
172
151
  }
173
152
  export function refreshing(connection, request) {
174
- const held = connection.rows('SELECT 1 FROM replica_rooms WHERE key = ? UNION ALL SELECT 1 FROM replica_transfers WHERE key = ?', [request.key, request.key]);
153
+ const held = connection.rows('SELECT 1 FROM replica_keys k WHERE k.key = ? AND NOT EXISTS (SELECT 1 FROM replica_erasing e WHERE e.key = k.key)', [request.key]);
175
154
  if (held.length === 0)
176
155
  return null;
177
156
  recomposed(connection, request.key, request.composed.fingerprint);
@@ -188,6 +167,7 @@ export function refreshing(connection, request) {
188
167
  fileId: null,
189
168
  change: null,
190
169
  written: null,
170
+ facts: null,
191
171
  }, false, composition);
192
172
  }
193
173
  for (const [list, present] of [
@@ -201,7 +181,6 @@ export function refreshing(connection, request) {
201
181
  return null;
202
182
  }
203
183
  function dropLayer(connection, key, layer) {
204
- unindexDocuments(connection, heldIds(connection, 'SELECT id FROM replica_entries WHERE key = ? AND layer = ?', [key, layer]));
205
184
  for (const table of ['replica_values', 'replica_links']) {
206
185
  connection.run(`DELETE FROM ${table} WHERE doc IN (SELECT id FROM replica_entries WHERE key = ? AND layer = ?)`, [key, layer]);
207
186
  }
@@ -220,7 +199,6 @@ function refreshedPaths(connection, key) {
220
199
  function applyRefresh(connection, key) {
221
200
  const touched = refreshedPaths(connection, key);
222
201
  const replaced = `SELECT c.id FROM replica_entries c JOIN replica_entries r ON r.key = c.key AND r.layer = ${REFRESHED} AND r.path = c.path WHERE c.key = ? AND c.layer = ${CONFIRMED}`;
223
- unindexDocuments(connection, heldIds(connection, replaced, [key]));
224
202
  for (const table of ['replica_values', 'replica_links']) {
225
203
  connection.run(`DELETE FROM ${table} WHERE doc IN (${replaced})`, [key]);
226
204
  }
@@ -239,12 +217,11 @@ function applyRefresh(connection, key) {
239
217
  connection.run('DELETE FROM replica_folders WHERE key = ? AND layer = ?', [key, REFRESHED]);
240
218
  return touched;
241
219
  }
220
+ function beneathRoots(path) {
221
+ return `EXISTS (SELECT 1 FROM json_each(?) r WHERE ${path} = r.value OR (${path} >= r.value || '/' AND ${path} < r.value || '0'))`;
222
+ }
242
223
  function counted(connection, key, roots) {
243
- const outside = roots.map(() => '(path = ? OR (path >= ? AND path < ?))').join(' OR ');
244
- const bind = [key];
245
- for (const root of roots)
246
- bind.push(root, `${root}/`, `${root}0`);
247
- const [row] = connection.rows(`SELECT count(*) AS held FROM replica_entries WHERE key = ? AND visible = 1 AND present = 1 AND (binary IS NOT NULL OR substr(path, -3) = '.md')${roots.length === 0 ? '' : ` AND NOT (${outside})`}`, bind);
224
+ const [row] = connection.rows(`SELECT count(*) AS held FROM replica_entries WHERE key = ? AND visible = 1 AND present = 1 AND (binary IS NOT NULL OR substr(path, -3) = '.md') AND NOT ${beneathRoots('replica_entries.path')}`, [key, JSON.stringify(roots)]);
248
225
  return number(row.held);
249
226
  }
250
227
  export function counts(connection, rooms) {
@@ -260,11 +237,10 @@ function commitRoom(connection, room) {
260
237
  const touched = new Set();
261
238
  recomposed(connection, room.key, room.composed.fingerprint);
262
239
  const composition = room.composed.composition;
263
- if (room.published !== undefined) {
264
- if (room.published.from !== null && room.published.from !== room.key) {
265
- erasing(connection, room.published.from, room.locator);
266
- }
267
- dropTransfer(connection, room.locator);
240
+ if (room.published !== undefined &&
241
+ room.published.from !== null &&
242
+ room.published.from !== room.key) {
243
+ erasing(connection, room.published.from, room.locator);
268
244
  }
269
245
  if (room.refreshed === true) {
270
246
  for (const path of applyRefresh(connection, room.key))
@@ -289,14 +265,28 @@ function commitRoom(connection, room) {
289
265
  const changed = [...touched];
290
266
  revealed(connection, room.key, changed);
291
267
  if (room.record !== undefined) {
292
- connection.run('INSERT OR REPLACE INTO replica_rooms (locator, key, record) VALUES (?, ?, ?)', [
293
- room.locator,
294
- room.key,
295
- room.record,
296
- ]);
268
+ connection.run(KEEP_MODEL, [room.record, room.record, room.record, room.record]);
269
+ connection.run(`INSERT OR REPLACE INTO replica_rooms (locator, key, record) VALUES (?, ?, ${MODEL_LEFT})`, [room.locator, room.key, room.record, room.record, room.record]);
297
270
  }
298
271
  return room.published === undefined ? changed : null;
299
272
  }
273
+ const SCHEMA = '$.model.snapshot.schema';
274
+ const KEEP_MODEL = `INSERT OR IGNORE INTO replica_models (identity, version, schema)
275
+ SELECT json_extract(?, '$.model.snapshot.identity'), json_extract(?, '$.model.snapshot.version'),
276
+ json_extract(?, '${SCHEMA}')
277
+ WHERE json_type(?, '${SCHEMA}') = 'text'`;
278
+ const MODEL_LEFT = `CASE WHEN json_type(?, '${SCHEMA}') = 'text' THEN json_set(?, '${SCHEMA}', json('null')) ELSE ? END`;
279
+ const UNHELD_MODELS = `DELETE FROM replica_models WHERE NOT EXISTS (
280
+ SELECT 1 FROM replica_rooms r
281
+ WHERE json_extract(r.record, '$.model.snapshot.identity') = replica_models.identity
282
+ AND json_extract(r.record, '$.model.snapshot.version') = replica_models.version
283
+ )`;
284
+ const HELD_RECORDS = `SELECT r.locator, r.key, CASE WHEN m.schema IS NULL THEN r.record
285
+ ELSE json_set(r.record, '${SCHEMA}', m.schema) END AS record
286
+ FROM replica_rooms r
287
+ LEFT JOIN replica_models m
288
+ ON m.identity = json_extract(r.record, '$.model.snapshot.identity')
289
+ AND m.version = json_extract(r.record, '$.model.snapshot.version')`;
300
290
  export function commit(connection, rooms) {
301
291
  const counted = {};
302
292
  const changed = {};
@@ -306,12 +296,11 @@ export function commit(connection, rooms) {
306
296
  counted[room.locator] = counts(connection, [
307
297
  { key: room.key, roots: room.roots ?? rootsOf(connection, room.locator) },
308
298
  ])[0];
309
- const [held] = connection.rows('SELECT rederiving, searching FROM replica_keys WHERE key = ?', [
310
- room.key,
311
- ]);
312
- indexed[room.locator] =
313
- held !== undefined && held.rederiving === null && held.searching === null;
299
+ const [held] = connection.rows('SELECT rederiving FROM replica_keys WHERE key = ?', [room.key]);
300
+ indexed[room.locator] = held !== undefined && held.rederiving === null;
314
301
  }
302
+ if (rooms.some((room) => room.record !== undefined))
303
+ connection.run(UNHELD_MODELS);
315
304
  return { counts: counted, changed, indexed };
316
305
  }
317
306
  function rootsOf(connection, locator) {
@@ -321,27 +310,25 @@ function rootsOf(connection, locator) {
321
310
  }
322
311
  export function fenceRooms(connection, locators) {
323
312
  for (const locator of locators) {
324
- for (const row of connection.rows('SELECT key FROM replica_keys WHERE locator = ? UNION SELECT key FROM replica_rooms WHERE locator = ? UNION SELECT key FROM replica_transfers WHERE locator = ?', [locator, locator, locator])) {
313
+ for (const row of connection.rows('SELECT key FROM replica_keys WHERE locator = ? UNION SELECT key FROM replica_rooms WHERE locator = ?', [locator, locator])) {
325
314
  erasing(connection, number(row.key), locator);
326
315
  }
327
316
  connection.run('DELETE FROM replica_rooms WHERE locator = ?', [locator]);
328
- dropTransfer(connection, locator);
329
317
  }
318
+ connection.run(UNHELD_MODELS);
330
319
  return null;
331
320
  }
332
- export function abandon(connection, locator, kept) {
333
- const [held] = connection.rows('SELECT key FROM replica_transfers WHERE locator = ?', [locator]);
334
- dropTransfer(connection, locator);
335
- if (held === undefined)
336
- return null;
337
- if (!kept)
338
- erasing(connection, number(held.key), locator);
339
- return number(held.key);
321
+ export function abandon(connection, locator) {
322
+ for (const row of connection.rows(`SELECT k.key FROM replica_keys k WHERE k.locator = ?
323
+ AND NOT EXISTS (SELECT 1 FROM replica_rooms r WHERE r.key = k.key)
324
+ AND NOT EXISTS (SELECT 1 FROM replica_erasing e WHERE e.key = k.key)`, [locator])) {
325
+ erasing(connection, number(row.key), locator);
326
+ }
327
+ return null;
340
328
  }
341
329
  export function release(connection, key) {
342
330
  const [held] = connection.rows(`SELECT k.locator FROM replica_keys k WHERE k.key = ?
343
- AND NOT EXISTS (SELECT 1 FROM replica_rooms r WHERE r.key = k.key)
344
- AND NOT EXISTS (SELECT 1 FROM replica_transfers t WHERE t.key = k.key)`, [key]);
331
+ AND NOT EXISTS (SELECT 1 FROM replica_rooms r WHERE r.key = k.key)`, [key]);
345
332
  if (held !== undefined)
346
333
  erasing(connection, key, text(held.locator));
347
334
  return null;
@@ -352,7 +339,6 @@ export function erase(connection, locator, limit) {
352
339
  return { remaining: false };
353
340
  const key = number(held.key);
354
341
  const batch = 'SELECT id FROM replica_entries WHERE key = ? ORDER BY id LIMIT ?';
355
- unindexDocuments(connection, heldIds(connection, batch, [key, limit]));
356
342
  for (const table of ['replica_values', 'replica_links']) {
357
343
  connection.run(`DELETE FROM ${table} WHERE doc IN (${batch})`, [key, limit]);
358
344
  }
@@ -369,51 +355,43 @@ export function erase(connection, locator, limit) {
369
355
  function cursor(value) {
370
356
  return value === null || value === undefined ? null : number(value);
371
357
  }
372
- export function rederive(connection, key, composed, bytes) {
358
+ export function rederive(connection, key, composed, bytes, ms, floor) {
359
+ const started = performance.now();
373
360
  recomposed(connection, key, composed.fingerprint);
374
- const [held] = connection.rows('SELECT rederiving, searching FROM replica_keys WHERE key = ?', [
375
- key,
376
- ]);
361
+ const [held] = connection.rows('SELECT rederiving FROM replica_keys WHERE key = ?', [key]);
377
362
  const deriving = cursor(held?.rederiving);
378
- const searching = cursor(held?.searching);
379
- if (deriving === null && searching === null)
380
- return { done: true };
363
+ if (deriving === null)
364
+ return { done: true, text: 0 };
381
365
  const composition = composed.composition;
382
- let last = Math.min(deriving ?? Infinity, searching ?? Infinity);
366
+ let last = deriving;
383
367
  let spent = 0;
384
- const reached = (done) => {
385
- const next = (from) => (from === null || done ? null : Math.max(from, last));
386
- connection.run('UPDATE replica_keys SET rederiving = ?, searching = ? WHERE key = ?', [
387
- next(deriving),
388
- next(searching),
389
- key,
390
- ]);
391
- return { done };
392
- };
393
- for (;;) {
394
- const rows = connection.rows('SELECT id, path, content FROM replica_entries WHERE key = ? AND present = 1 AND id > ? ORDER BY id LIMIT ?', [key, last, DERIVED_ROWS]);
368
+ let built = 0;
369
+ let read = false;
370
+ reading: for (;;) {
371
+ const rows = connection.rows('SELECT id, path, type, fields, links, octet_length(content) AS size FROM replica_entries WHERE key = ? AND present = 1 AND id > ? ORDER BY id LIMIT ?', [key, last, DERIVED_ROWS]);
395
372
  for (const row of rows) {
396
373
  const id = number(row.id);
397
374
  const path = text(row.path);
398
- const content = text(row.content);
399
- const owedRows = deriving !== null && id > deriving;
400
- const owedWords = searching !== null && id > searching && content !== null;
401
- if (owedRows) {
402
- const made = derived(path, content, composition);
403
- dropDerived(connection, id);
404
- writeDerived(connection, id, key, made);
405
- }
406
- if (owedWords && described(path, content).queried) {
407
- indexDocument(connection, id, path, content);
408
- }
375
+ const size = row.size === null ? 0 : number(row.size);
376
+ dropDerived(connection, id);
377
+ writeDerived(connection, id, key, path, {
378
+ type: text(row.type),
379
+ fields: json(row.fields),
380
+ links: json(row.links) ?? [],
381
+ }, composition);
382
+ built += size;
409
383
  last = id;
410
- spent += ENTRY_WEIGHT + (content?.length ?? 0);
411
- if (spent >= bytes)
412
- return reached(false);
384
+ spent += ENTRY_WEIGHT + size;
385
+ if (spent >= bytes || (spent >= floor && performance.now() - started >= ms))
386
+ break reading;
387
+ }
388
+ if (rows.length < DERIVED_ROWS) {
389
+ read = true;
390
+ break;
413
391
  }
414
- if (rows.length < DERIVED_ROWS)
415
- return reached(true);
416
392
  }
393
+ connection.run('UPDATE replica_keys SET rederiving = ? WHERE key = ?', [read ? null : last, key]);
394
+ return { done: read, text: built };
417
395
  }
418
396
  function heldEntry(row) {
419
397
  return {
@@ -425,15 +403,45 @@ function heldEntry(row) {
425
403
  change: json(row.change),
426
404
  written: text(row.written),
427
405
  type: text(row.type),
406
+ facts: factsHeld(row),
407
+ };
408
+ }
409
+ function factsHeld(row) {
410
+ const type = text(row.declared);
411
+ if (type === null)
412
+ return null;
413
+ return {
414
+ type,
415
+ fields: json(row.fields) ?? {},
416
+ links: json(row.links) ?? [],
428
417
  };
429
418
  }
430
- const ENTRY_COLUMNS = 'e.path, e.content, e.binary, e.revision, e.file_id, e.change, e.written, e.type';
419
+ const ENTRY_COLUMNS = 'e.path, e.content, e.binary, e.revision, e.file_id, e.change, e.written, e.type, e.declared, e.fields, e.links';
420
+ function unrefreshed(alias) {
421
+ return `NOT EXISTS (SELECT 1 FROM replica_entries r WHERE r.key = ${alias}.key AND r.layer = ${REFRESHED} AND r.path = ${alias}.path)`;
422
+ }
431
423
  function viewed(view, alias) {
432
424
  if (view === 'visible')
433
425
  return `${alias}.visible = 1 AND ${alias}.present = 1`;
434
426
  if (view === 'confirmed')
435
427
  return `${alias}.layer = ${CONFIRMED}`;
436
- return `${alias}.present = 1 AND (${alias}.layer = ${REFRESHED} OR (${alias}.layer = ${CONFIRMED} AND NOT EXISTS (SELECT 1 FROM replica_entries r WHERE r.key = ${alias}.key AND r.layer = ${REFRESHED} AND r.path = ${alias}.path)))`;
428
+ return `${alias}.present = 1 AND (${alias}.layer = ${REFRESHED} OR (${alias}.layer = ${CONFIRMED} AND ${unrefreshed(alias)}))`;
429
+ }
430
+ function layers(view) {
431
+ if (view !== 'refreshed')
432
+ return [viewed(view, 'e')];
433
+ return [
434
+ `e.layer = ${REFRESHED} AND e.present = 1`,
435
+ `e.layer = ${CONFIRMED} AND e.present = 1 AND ${unrefreshed('e')}`,
436
+ ];
437
+ }
438
+ function pathOrdered(connection, columns, key, view, condition, after, limit) {
439
+ const beyond = after === null ? '' : ' AND e.path > ?';
440
+ const parts = layers(view).map((layer) => `SELECT ${columns} FROM replica_entries e WHERE e.key = ? AND ${layer}${condition}${beyond}`);
441
+ return connection.rows(`${parts.join(' UNION ALL ')} ORDER BY path LIMIT ?`, [
442
+ ...parts.flatMap(() => (after === null ? [key] : [key, after])),
443
+ limit,
444
+ ]);
437
445
  }
438
446
  export function entries(connection, key, view, list) {
439
447
  if (list.length === 0)
@@ -453,61 +461,21 @@ export function typed(connection, key, view, list) {
453
461
  binary: number(row.binary) === 1,
454
462
  }));
455
463
  }
456
- export function referrers(connection, key, view, targets, kinds) {
464
+ export function referrers(connection, key, view, targets) {
457
465
  if (targets.length === 0)
458
466
  return [];
459
467
  return connection
460
- .rows(`SELECT DISTINCT e.path, l.target, l.kind FROM replica_links l JOIN replica_entries e ON e.id = l.doc WHERE l.key = ? AND l.target IN (SELECT value FROM json_each(?)) AND l.kind IN (SELECT value FROM json_each(?)) AND ${viewed(view, 'e')}`, [key, paths(targets), JSON.stringify(kinds)])
461
- .map((row) => ({
462
- path: text(row.path),
463
- target: text(row.target),
464
- kind: text(row.kind),
465
- }));
466
- }
467
- export function walk(connection, key, view, after, bytes) {
468
- const found = [];
469
- let spent = 0;
470
- let from = after;
471
- for (;;) {
472
- const rows = connection.rows(`SELECT ${ENTRY_COLUMNS} FROM replica_entries e WHERE e.key = ? AND ${viewed(view, 'e')}${from === null ? '' : ' AND e.path > ?'} ORDER BY e.path LIMIT 64`, from === null ? [key] : [key, from]);
473
- for (const row of rows) {
474
- const entry = heldEntry(row);
475
- found.push(entry);
476
- spent += 256 + (entry.content?.length ?? 0) * 2;
477
- if (spent >= bytes)
478
- return { entries: found, next: entry.path };
479
- }
480
- if (rows.length < 64)
481
- return { entries: found, next: null };
482
- from = found.at(-1).path;
483
- }
468
+ .rows(`SELECT DISTINCT e.path, l.target FROM replica_links l JOIN replica_entries e ON e.id = l.doc WHERE l.key = ? AND l.target IN (SELECT value FROM json_each(?)) AND ${viewed(view, 'e')}`, [key, paths(targets)])
469
+ .map((row) => ({ path: text(row.path), target: text(row.target) }));
484
470
  }
485
471
  export function files(connection, key, view, after, limit) {
486
- return connection
487
- .rows(`SELECT e.path, e.revision FROM replica_entries e WHERE e.key = ? AND ${viewed(view, 'e')} AND e.content IS NOT NULL AND e.revision IS NOT NULL${after === null ? '' : ' AND e.path > ?'} ORDER BY e.path LIMIT ?`, after === null ? [key, limit] : [key, after, limit])
488
- .map((row) => ({ path: text(row.path), revision: text(row.revision) }));
472
+ return pathOrdered(connection, 'e.path, e.revision', key, view, ' AND e.content IS NOT NULL AND e.revision IS NOT NULL', after, limit).map((row) => ({ path: text(row.path), revision: text(row.revision) }));
473
+ }
474
+ export function folders(connection, key, view, list) {
475
+ return list.filter((path) => connection.rows(`SELECT 1 FROM replica_folders f WHERE f.key = ? AND f.layer = ${CONFIRMED} AND f.present = 1 AND f.path = ? UNION ALL SELECT 1 FROM replica_entries e WHERE e.key = ? AND ${viewed(view, 'e')} AND e.path >= ? AND e.path < ? LIMIT 1`, [key, path, key, `${path}/`, `${path}0`]).length > 0);
489
476
  }
490
477
  export function typedWithin(connection, key, view, roots, within) {
491
- const inside = roots.map(() => '(e.path = ? OR (e.path >= ? AND e.path < ?))').join(' OR ');
492
- const bind = [key];
493
- for (const root of roots)
494
- bind.push(root, `${root}/`, `${root}0`);
495
- const placed = roots.length === 0 ? (within ? ' AND 0' : '') : ` AND ${within ? '' : 'NOT '}(${inside})`;
496
- return (connection.rows(`SELECT 1 FROM replica_entries e WHERE e.key = ? AND ${viewed(view, 'e')} AND e.declared IS NOT NULL AND e.declared <> 'any'${placed} LIMIT 1`, bind).length > 0);
497
- }
498
- export function transferPart(connection, locator, token) {
499
- const [held] = connection.rows('SELECT part FROM replica_transfer_parts WHERE locator = ? AND token = ?', [locator, token]);
500
- return held?.part instanceof Uint8Array ? held.part : null;
501
- }
502
- export function keepParts(connection, parts) {
503
- for (const { locator, token, part } of parts) {
504
- connection.run('DELETE FROM replica_transfer_parts WHERE locator = ? AND token = ?', [
505
- locator,
506
- token,
507
- ]);
508
- connection.run('INSERT INTO replica_transfer_parts (locator, token, part) SELECT ?, ?, ? WHERE EXISTS (SELECT 1 FROM replica_transfers WHERE locator = ?)', [locator, token, part, locator]);
509
- }
510
- return null;
478
+ return (connection.rows(`SELECT 1 FROM replica_entries e WHERE e.key = ? AND ${viewed(view, 'e')} AND e.declared IS NOT NULL AND e.declared <> 'any' AND ${within ? '' : 'NOT '}${beneathRoots('e.path')} LIMIT 1`, [key, JSON.stringify(roots)]).length > 0);
511
479
  }
512
480
  export function opened(connection) {
513
481
  const facts = {};
@@ -515,31 +483,18 @@ export function opened(connection) {
515
483
  facts[text(row.name)] = text(row.value);
516
484
  }
517
485
  return {
518
- rooms: connection.rows('SELECT locator, key, record FROM replica_rooms').map((row) => ({
519
- locator: text(row.locator),
520
- key: number(row.key),
521
- record: text(row.record),
522
- })),
523
- transfers: connection.rows('SELECT locator, key, record FROM replica_transfers').map((row) => ({
486
+ rooms: connection.rows(HELD_RECORDS).map((row) => ({
524
487
  locator: text(row.locator),
525
488
  key: number(row.key),
526
489
  record: text(row.record),
527
490
  })),
528
- kept: connection
529
- .rows('SELECT locator, token, length(part) AS bytes FROM replica_transfer_parts')
530
- .map((row) => ({
531
- locator: text(row.locator),
532
- token: text(row.token),
533
- bytes: number(row.bytes),
534
- })),
535
491
  keys: connection
536
- .rows('SELECT key, locator, transfer, rederiving, searching FROM replica_keys')
492
+ .rows('SELECT key, locator, transfer, rederiving FROM replica_keys')
537
493
  .map((row) => ({
538
494
  key: number(row.key),
539
495
  locator: text(row.locator),
540
496
  transfer: text(row.transfer),
541
497
  rederiving: cursor(row.rederiving),
542
- searching: cursor(row.searching),
543
498
  })),
544
499
  facts,
545
500
  presentation: connection.rows('SELECT app, value FROM replica_presentation').map((row) => ({
@@ -552,7 +507,6 @@ export function opened(connection) {
552
507
  orphans: connection
553
508
  .rows(`SELECT k.key FROM replica_keys k
554
509
  WHERE NOT EXISTS (SELECT 1 FROM replica_rooms r WHERE r.key = k.key)
555
- AND NOT EXISTS (SELECT 1 FROM replica_transfers t WHERE t.key = k.key)
556
510
  AND NOT EXISTS (SELECT 1 FROM replica_erasing e WHERE e.key = k.key)`)
557
511
  .map((row) => number(row.key)),
558
512
  erasing: connection.rows('SELECT key, locator FROM replica_erasing').map((row) => ({
@@ -567,5 +521,4 @@ export function ended(connection) {
567
521
  if (table !== undefined)
568
522
  connection.run(`DELETE FROM ${table}`);
569
523
  }
570
- unindexAll(connection);
571
524
  }