on-zero 0.6.13 → 0.6.15

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 (93) hide show
  1. package/dist/cjs/createSchemaFromDrizzle.cjs +4 -4
  2. package/dist/cjs/createSchemaFromDrizzle.native.js +4 -4
  3. package/dist/cjs/createSchemaFromDrizzle.native.js.map +1 -1
  4. package/dist/cjs/createZeroDirectServer.cjs +279 -0
  5. package/dist/cjs/createZeroDirectServer.native.js +292 -0
  6. package/dist/cjs/createZeroDirectServer.native.js.map +1 -0
  7. package/dist/cjs/createZeroSQLiteServer.cjs +8 -277
  8. package/dist/cjs/createZeroSQLiteServer.native.js +8 -390
  9. package/dist/cjs/createZeroSQLiteServer.native.js.map +1 -1
  10. package/dist/cjs/createZeroSQLiteServer.test.cjs +30 -3
  11. package/dist/cjs/createZeroSQLiteServer.test.native.js +31 -3
  12. package/dist/cjs/createZeroSQLiteServer.test.native.js.map +1 -1
  13. package/dist/cjs/createZeroServerCore.cjs +20 -205
  14. package/dist/cjs/createZeroServerCore.native.js +19 -213
  15. package/dist/cjs/createZeroServerCore.native.js.map +1 -1
  16. package/dist/cjs/generate.cjs +10 -3
  17. package/dist/cjs/generate.native.js +10 -3
  18. package/dist/cjs/generate.native.js.map +1 -1
  19. package/dist/cjs/generate.test.cjs +39 -0
  20. package/dist/cjs/generate.test.native.js +39 -0
  21. package/dist/cjs/generate.test.native.js.map +1 -1
  22. package/dist/cjs/sqliteRuntime.cjs +318 -0
  23. package/dist/cjs/sqliteRuntime.native.js +438 -0
  24. package/dist/cjs/sqliteRuntime.native.js.map +1 -0
  25. package/dist/cjs/syncHost.cjs +16 -9
  26. package/dist/cjs/syncHost.native.js +21 -12
  27. package/dist/cjs/syncHost.native.js.map +1 -1
  28. package/dist/cjs/syncHost.test.cjs +13 -2
  29. package/dist/cjs/syncHost.test.native.js +14 -2
  30. package/dist/cjs/syncHost.test.native.js.map +1 -1
  31. package/dist/esm/createSchemaFromDrizzle.mjs +2 -2
  32. package/dist/esm/createSchemaFromDrizzle.native.js +2 -2
  33. package/dist/esm/createZeroDirectServer.mjs +251 -0
  34. package/dist/esm/createZeroDirectServer.mjs.map +1 -0
  35. package/dist/esm/createZeroDirectServer.native.js +261 -0
  36. package/dist/esm/createZeroDirectServer.native.js.map +1 -0
  37. package/dist/esm/createZeroSQLiteServer.mjs +3 -272
  38. package/dist/esm/createZeroSQLiteServer.mjs.map +1 -1
  39. package/dist/esm/createZeroSQLiteServer.native.js +3 -385
  40. package/dist/esm/createZeroSQLiteServer.native.js.map +1 -1
  41. package/dist/esm/createZeroSQLiteServer.test.mjs +30 -3
  42. package/dist/esm/createZeroSQLiteServer.test.mjs.map +1 -1
  43. package/dist/esm/createZeroSQLiteServer.test.native.js +31 -3
  44. package/dist/esm/createZeroSQLiteServer.test.native.js.map +1 -1
  45. package/dist/esm/createZeroServerCore.mjs +18 -202
  46. package/dist/esm/createZeroServerCore.mjs.map +1 -1
  47. package/dist/esm/createZeroServerCore.native.js +18 -211
  48. package/dist/esm/createZeroServerCore.native.js.map +1 -1
  49. package/dist/esm/generate.mjs +10 -3
  50. package/dist/esm/generate.mjs.map +1 -1
  51. package/dist/esm/generate.native.js +10 -3
  52. package/dist/esm/generate.native.js.map +1 -1
  53. package/dist/esm/generate.test.mjs +39 -1
  54. package/dist/esm/generate.test.mjs.map +1 -1
  55. package/dist/esm/generate.test.native.js +39 -1
  56. package/dist/esm/generate.test.native.js.map +1 -1
  57. package/dist/esm/sqliteRuntime.mjs +289 -0
  58. package/dist/esm/sqliteRuntime.mjs.map +1 -0
  59. package/dist/esm/sqliteRuntime.native.js +406 -0
  60. package/dist/esm/sqliteRuntime.native.js.map +1 -0
  61. package/dist/esm/syncHost.mjs +14 -7
  62. package/dist/esm/syncHost.mjs.map +1 -1
  63. package/dist/esm/syncHost.native.js +19 -10
  64. package/dist/esm/syncHost.native.js.map +1 -1
  65. package/dist/esm/syncHost.test.mjs +13 -2
  66. package/dist/esm/syncHost.test.mjs.map +1 -1
  67. package/dist/esm/syncHost.test.native.js +14 -2
  68. package/dist/esm/syncHost.test.native.js.map +1 -1
  69. package/package.json +5 -6
  70. package/src/createSchemaFromDrizzle.ts +2 -2
  71. package/src/createZeroDirectServer.ts +427 -0
  72. package/src/createZeroSQLiteServer.test.ts +20 -5
  73. package/src/createZeroSQLiteServer.ts +14 -481
  74. package/src/createZeroServerCore.ts +32 -337
  75. package/src/generate.test.ts +57 -1
  76. package/src/generate.ts +23 -3
  77. package/src/sqliteRuntime.ts +512 -0
  78. package/src/syncHost.test.ts +10 -3
  79. package/src/syncHost.ts +49 -12
  80. package/test-fixtures/server-return-types.ts +8 -1
  81. package/types/createSchemaFromDrizzle.d.ts +2 -2
  82. package/types/createSchemaFromDrizzle.d.ts.map +1 -1
  83. package/types/createZeroDirectServer.d.ts +80 -0
  84. package/types/createZeroDirectServer.d.ts.map +1 -0
  85. package/types/createZeroSQLiteServer.d.ts +5 -30
  86. package/types/createZeroSQLiteServer.d.ts.map +1 -1
  87. package/types/createZeroServerCore.d.ts +30 -87
  88. package/types/createZeroServerCore.d.ts.map +1 -1
  89. package/types/generate.d.ts.map +1 -1
  90. package/types/sqliteRuntime.d.ts +71 -0
  91. package/types/sqliteRuntime.d.ts.map +1 -0
  92. package/types/syncHost.d.ts +10 -19
  93. package/types/syncHost.d.ts.map +1 -1
@@ -17,21 +17,21 @@ var __copyProps = (to, from, except, desc) => {
17
17
  }
18
18
  return to;
19
19
  };
20
+ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
20
21
  var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
21
22
  value: true
22
23
  }), mod);
23
24
  var createZeroSQLiteServer_exports = {};
24
25
  __export(createZeroSQLiteServer_exports, {
25
- createZeroSQLiteServer: () => createZeroSQLiteServer,
26
- createZeroSQLiteTransaction: () => createZeroSQLiteTransaction
26
+ createZeroSQLiteServer: () => createZeroSQLiteServer
27
27
  });
28
28
  module.exports = __toCommonJS(createZeroSQLiteServer_exports);
29
- var import_zero = require("@rocicorp/zero");
30
- var import_bindings = require("@rocicorp/zero/bindings");
31
29
  var import_createZeroServerCore = require("./createZeroServerCore.cjs");
30
+ var import_sqliteRuntime = require("./sqliteRuntime.cjs");
31
+ __reExport(createZeroSQLiteServer_exports, require("./sqliteRuntime.cjs"), module.exports);
32
32
  function createZeroSQLiteServer({
33
- encodeValue = encodeSQLiteValue,
34
- ledgerTables = defaultLedgerTables,
33
+ encodeValue = import_sqliteRuntime.encodeSQLiteValue,
34
+ ledgerTables = import_sqliteRuntime.defaultLedgerTables,
35
35
  transactionProvider,
36
36
  ...options
37
37
  }) {
@@ -44,276 +44,7 @@ function createZeroSQLiteServer({
44
44
  };
45
45
  return (0, import_createZeroServerCore.createZeroServerCore)({
46
46
  ...options,
47
- createDatabase: () => createSQLiteDatabase(databaseOptions),
48
- persistAlreadyProcessed: args => persistAlreadyProcessedMutationResults(databaseOptions, args)
47
+ createDatabase: () => (0, import_sqliteRuntime.createSQLiteDatabase)(databaseOptions),
48
+ persistAlreadyProcessed: args => (0, import_sqliteRuntime.persistAlreadyProcessedMutationResults)(databaseOptions, args)
49
49
  });
50
- }
51
- function createSQLiteDatabase(options) {
52
- return {
53
- async transaction(callback, input) {
54
- let committedLedgers = /* @__PURE__ */new Set();
55
- const value = await options.transactionProvider(async executor => {
56
- const attemptLedgers = /* @__PURE__ */new Set();
57
- const ensureLedger = async upstreamSchema => {
58
- const tables = options.ledgerTables(upstreamSchema);
59
- const key = ledgerKey(tables);
60
- if (options.initializedLedgers.has(key) || attemptLedgers.has(key)) {
61
- return;
62
- }
63
- await createLedgerTables(executor, tables);
64
- attemptLedgers.add(key);
65
- };
66
- const transaction = createZeroSQLiteTransaction(options, executor, input);
67
- const result = await callback(transaction, createLedgerHooks(options, executor, ensureLedger, input));
68
- committedLedgers = attemptLedgers;
69
- return result;
70
- });
71
- for (const key of committedLedgers) options.initializedLedgers.add(key);
72
- return value;
73
- }
74
- };
75
- }
76
- function createZeroSQLiteTransaction(options, executor, input) {
77
- const transactionOptions = {
78
- encodeValue: options.encodeValue ?? encodeSQLiteValue,
79
- schema: options.schema
80
- };
81
- const clientID = input?.clientID ?? "";
82
- const mutationID = input?.mutationID ?? 0;
83
- const mutate = new Proxy({}, {
84
- get(_target, tableKey) {
85
- const tableName = String(tableKey);
86
- if (!options.schema.tables[tableName]) {
87
- throw new Error(`unknown SQLite mutation table ${tableName}`);
88
- }
89
- return new Proxy({}, {
90
- get(_innerTarget, kindKey) {
91
- const kind = String(kindKey);
92
- if (!isCrudKind(kind)) return;
93
- return value => executeCrud(transactionOptions, executor, tableName, kind, value);
94
- }
95
- });
96
- }
97
- });
98
- const runQuery = (ast, format, queryName) => Promise.resolve(executor.queryAst(ast, format, queryName));
99
- const dbTransaction = {
100
- wrappedTransaction: executor,
101
- query: (sql, args) => executor.query(sql, args),
102
- runQuery
103
- };
104
- return {
105
- clientID,
106
- dbTransaction,
107
- location: "server",
108
- mutate,
109
- mutationID,
110
- query: transactionOptions.schema.enableLegacyQueries ? createLegacyQueryBuilder(transactionOptions.schema, query => {
111
- const internals = (0, import_bindings.asQueryInternals)(query);
112
- return runQuery(internals.ast, internals.format, internals.customQueryID?.name);
113
- }) : void 0,
114
- reason: "authoritative",
115
- async run(query) {
116
- const internals = (0, import_bindings.asQueryInternals)(query);
117
- return runQuery(internals.ast, internals.format, internals.customQueryID?.name);
118
- }
119
- };
120
- }
121
- function isCrudKind(value) {
122
- return value === "delete" || value === "insert" || value === "update" || value === "upsert";
123
- }
124
- async function executeCrud(options, executor, tableName, kind, raw) {
125
- if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
126
- throw new Error(`${tableName}.${kind} expects an object`);
127
- }
128
- const table = options.schema.tables[tableName];
129
- const values = Object.fromEntries(Object.entries(raw).filter(([, value]) => value !== void 0));
130
- for (const columnName of Object.keys(values)) {
131
- if (!table.columns[columnName]) {
132
- throw new Error(`unknown SQLite column ${tableName}.${columnName}`);
133
- }
134
- }
135
- const primaryValues = table.primaryKey.map(columnName => {
136
- if (!(columnName in values)) {
137
- throw new Error(`${tableName}.${kind} is missing primary key ${columnName}`);
138
- }
139
- return encodeColumn(options, tableName, columnName, values[columnName]);
140
- });
141
- const primaryWhere = table.primaryKey.map(columnName => `${quoteSQLiteIdentifier(serverColumn(table, columnName))} = ?`).join(" AND ");
142
- const serverTableName = quoteSQLiteIdentifier(table.serverName ?? table.name);
143
- if (kind === "delete") {
144
- await executor.exec(`DELETE FROM ${serverTableName} WHERE ${primaryWhere}`, primaryValues);
145
- return;
146
- }
147
- const columnNames = Object.keys(values);
148
- if (columnNames.length === 0) {
149
- throw new Error(`${tableName}.${kind} has no values`);
150
- }
151
- const serverColumns = columnNames.map(columnName => quoteSQLiteIdentifier(serverColumn(table, columnName)));
152
- const params = columnNames.map(columnName => encodeColumn(options, tableName, columnName, values[columnName]));
153
- const insert = `INSERT INTO ${serverTableName} (${serverColumns.join(", ")}) VALUES (${columnNames.map(() => "?").join(", ")})`;
154
- if (kind === "insert") {
155
- await executor.exec(insert, params);
156
- return;
157
- }
158
- if (kind === "upsert") {
159
- const mutableColumns2 = columnNames.filter(columnName => !table.primaryKey.includes(columnName));
160
- const conflictColumns = table.primaryKey.map(columnName => quoteSQLiteIdentifier(serverColumn(table, columnName))).join(", ");
161
- const conflictAction = mutableColumns2.length === 0 ? "DO NOTHING" : `DO UPDATE SET ${mutableColumns2.map(columnName => {
162
- const column = quoteSQLiteIdentifier(serverColumn(table, columnName));
163
- return `${column} = excluded.${column}`;
164
- }).join(", ")}`;
165
- await executor.exec(`${insert} ON CONFLICT (${conflictColumns}) ${conflictAction}`, params);
166
- return;
167
- }
168
- const mutableColumns = columnNames.filter(columnName => !table.primaryKey.includes(columnName));
169
- if (mutableColumns.length === 0) return;
170
- await executor.exec(`UPDATE ${serverTableName} SET ${mutableColumns.map(columnName => `${quoteSQLiteIdentifier(serverColumn(table, columnName))} = ?`).join(", ")} WHERE ${primaryWhere}`, [...mutableColumns.map(columnName => encodeColumn(options, tableName, columnName, values[columnName])), ...primaryValues]);
171
- }
172
- function serverColumn(table, columnName) {
173
- const column = table.columns[columnName];
174
- if (!column) throw new Error(`unknown SQLite column ${table.name}.${columnName}`);
175
- return column.serverName ?? columnName;
176
- }
177
- function encodeColumn(options, tableName, columnName, value) {
178
- return options.encodeValue(value, {
179
- column: options.schema.tables[tableName].columns[columnName],
180
- columnName,
181
- tableName
182
- });
183
- }
184
- function createLegacyQueryBuilder(schema, run) {
185
- const builder = (0, import_zero.createBuilder)(schema);
186
- return new Proxy(builder, {
187
- get(target, property) {
188
- return makeRunnableQuery(Reflect.get(target, property, target), run);
189
- }
190
- });
191
- }
192
- function makeRunnableQuery(query, run) {
193
- if (!isQueryBuilder(query)) return query;
194
- return new Proxy(query, {
195
- get(target, property) {
196
- if (property === "run") return () => run(target);
197
- if (property === "materialize" || property === "preload") {
198
- return () => {
199
- throw new Error(`${String(property)}() is not supported in server transactions`);
200
- };
201
- }
202
- const value = Reflect.get(target, property, target);
203
- if (typeof value !== "function") return value;
204
- return (...args) => makeRunnableQuery(Reflect.apply(value, target, args), run);
205
- }
206
- });
207
- }
208
- function isQueryBuilder(value) {
209
- if (!value || typeof value !== "object") return false;
210
- try {
211
- (0, import_bindings.asQueryInternals)(value);
212
- return true;
213
- } catch {
214
- return false;
215
- }
216
- }
217
- function createLedgerHooks(options, executor, ensureLedger, input) {
218
- const upstreamSchema = input?.upstreamSchema ?? "";
219
- const clientGroupID = input?.clientGroupID ?? "";
220
- const clientID = input?.clientID ?? "";
221
- const tables = options.ledgerTables(upstreamSchema);
222
- const clientsTable = quoteSQLiteIdentifier(tables.clients);
223
- const mutationsTable = quoteSQLiteIdentifier(tables.mutations);
224
- return {
225
- async updateClientMutationID() {
226
- await ensureLedger(upstreamSchema);
227
- const rows = await executor.query(`INSERT INTO ${clientsTable}
228
- (clientGroupID, clientID, lastMutationID)
229
- VALUES (?, ?, 1)
230
- ON CONFLICT (clientGroupID, clientID)
231
- DO UPDATE SET lastMutationID = lastMutationID + 1
232
- RETURNING lastMutationID`, [clientGroupID, clientID]);
233
- const lastMutationID = rows[0]?.lastMutationID;
234
- if (typeof lastMutationID !== "number" && typeof lastMutationID !== "bigint") {
235
- throw new Error("SQLite mutation ledger returned no lastMutationID");
236
- }
237
- return {
238
- lastMutationID
239
- };
240
- },
241
- async writeMutationResult(result) {
242
- await ensureLedger(upstreamSchema);
243
- await executor.exec(`INSERT INTO ${mutationsTable}
244
- (clientGroupID, clientID, mutationID, result)
245
- VALUES (?, ?, ?, ?)`, [clientGroupID, result.id.clientID, result.id.id, JSON.stringify(result.result)]);
246
- },
247
- async deleteMutationResults(args) {
248
- await ensureLedger(upstreamSchema);
249
- if ("type" in args && args.type === "bulk") {
250
- if (args.clientIDs.length === 0) return;
251
- await executor.exec(`DELETE FROM ${mutationsTable}
252
- WHERE clientGroupID = ?
253
- AND clientID IN (${args.clientIDs.map(() => "?").join(", ")})`, [args.clientGroupID, ...args.clientIDs]);
254
- return;
255
- }
256
- await executor.exec(`DELETE FROM ${mutationsTable}
257
- WHERE clientGroupID = ?
258
- AND clientID = ?
259
- AND mutationID <= ?`, [args.clientGroupID, args.clientID, args.upToMutationID]);
260
- }
261
- };
262
- }
263
- async function persistAlreadyProcessedMutationResults(options, {
264
- clientGroupID,
265
- mutations,
266
- upstreamSchema
267
- }) {
268
- const tables = options.ledgerTables(upstreamSchema);
269
- const table = quoteSQLiteIdentifier(tables.mutations);
270
- const key = ledgerKey(tables);
271
- await options.transactionProvider(async executor => {
272
- if (!options.initializedLedgers.has(key)) {
273
- await createLedgerTables(executor, tables);
274
- }
275
- for (const mutation of mutations) {
276
- await executor.exec(`INSERT INTO ${table}
277
- (clientGroupID, clientID, mutationID, result)
278
- VALUES (?, ?, ?, ?)
279
- ON CONFLICT (clientGroupID, clientID, mutationID) DO NOTHING`, [clientGroupID, mutation.id.clientID, mutation.id.id, JSON.stringify(mutation.result)]);
280
- }
281
- });
282
- options.initializedLedgers.add(key);
283
- }
284
- async function createLedgerTables(executor, tables) {
285
- await executor.exec(`CREATE TABLE IF NOT EXISTS ${quoteSQLiteIdentifier(tables.clients)} (
286
- clientGroupID TEXT NOT NULL,
287
- clientID TEXT NOT NULL,
288
- lastMutationID INTEGER NOT NULL,
289
- PRIMARY KEY (clientGroupID, clientID)
290
- )`);
291
- await executor.exec(`CREATE TABLE IF NOT EXISTS ${quoteSQLiteIdentifier(tables.mutations)} (
292
- clientGroupID TEXT NOT NULL,
293
- clientID TEXT NOT NULL,
294
- mutationID INTEGER NOT NULL,
295
- result TEXT NOT NULL,
296
- PRIMARY KEY (clientGroupID, clientID, mutationID)
297
- )`);
298
- }
299
- function ledgerKey(tables) {
300
- return `${tables.clients}\0${tables.mutations}`;
301
- }
302
- function defaultLedgerTables(upstreamSchema) {
303
- const prefix = upstreamSchema ? `${upstreamSchema}_` : "";
304
- return {
305
- clients: `${prefix}clients`,
306
- mutations: `${prefix}mutations`
307
- };
308
- }
309
- function encodeSQLiteValue(value, {
310
- column
311
- }) {
312
- if (value === null) return null;
313
- if (column.type === "boolean") return value ? 1 : 0;
314
- if (column.type === "json") return JSON.stringify(value);
315
- return value;
316
- }
317
- function quoteSQLiteIdentifier(value) {
318
- return `"${value.replaceAll('"', '""')}"`;
319
50
  }