@lix-js/sdk 0.0.1 → 0.1.0

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 (278) hide show
  1. package/LICENSE +21 -0
  2. package/dist/change/apply-changes.js +9 -9
  3. package/dist/change/apply-changes.js.map +1 -1
  4. package/dist/change/apply-changes.test.js +5 -5
  5. package/dist/change/apply-changes.test.js.map +1 -1
  6. package/dist/database/apply-schema.d.ts.map +1 -1
  7. package/dist/database/apply-schema.js +20 -72
  8. package/dist/database/apply-schema.js.map +1 -1
  9. package/dist/database/execute-sync.test.js +3 -3
  10. package/dist/database/execute-sync.test.js.map +1 -1
  11. package/dist/database/init-db.d.ts.map +1 -1
  12. package/dist/database/init-db.js +18 -3
  13. package/dist/database/init-db.js.map +1 -1
  14. package/dist/database/init-db.test.js +128 -17
  15. package/dist/database/init-db.test.js.map +1 -1
  16. package/dist/database/kysely-plugin/parse-jsonb-plugin-v1.d.ts.map +1 -1
  17. package/dist/database/kysely-plugin/parse-jsonb-plugin-v1.js +5 -2
  18. package/dist/database/kysely-plugin/parse-jsonb-plugin-v1.js.map +1 -1
  19. package/dist/database/mutation-log/database-schema.d.ts.map +1 -1
  20. package/dist/database/mutation-log/database-schema.js +1 -3
  21. package/dist/database/mutation-log/database-schema.js.map +1 -1
  22. package/dist/database/nano-id.d.ts +21 -0
  23. package/dist/database/nano-id.d.ts.map +1 -0
  24. package/dist/database/nano-id.js +58 -0
  25. package/dist/database/nano-id.js.map +1 -0
  26. package/dist/database/nano-id.test.d.ts +2 -0
  27. package/dist/database/nano-id.test.d.ts.map +1 -0
  28. package/dist/database/nano-id.test.js +13 -0
  29. package/dist/database/nano-id.test.js.map +1 -0
  30. package/dist/database/schema.d.ts +15 -23
  31. package/dist/database/schema.d.ts.map +1 -1
  32. package/dist/discussion/create-comment.d.ts +0 -2
  33. package/dist/discussion/create-comment.d.ts.map +1 -1
  34. package/dist/discussion/create-comment.js +0 -1
  35. package/dist/discussion/create-comment.js.map +1 -1
  36. package/dist/discussion/create-discussion.d.ts +3 -5
  37. package/dist/discussion/create-discussion.d.ts.map +1 -1
  38. package/dist/discussion/create-discussion.js +4 -5
  39. package/dist/discussion/create-discussion.js.map +1 -1
  40. package/dist/discussion/create-discussion.test.js +8 -34
  41. package/dist/discussion/create-discussion.test.js.map +1 -1
  42. package/dist/file-queue/file-handlers.d.ts +24 -0
  43. package/dist/file-queue/file-handlers.d.ts.map +1 -0
  44. package/dist/file-queue/file-handlers.js +209 -0
  45. package/dist/file-queue/file-handlers.js.map +1 -0
  46. package/dist/file-queue/file-queue-process.d.ts +5 -0
  47. package/dist/file-queue/file-queue-process.d.ts.map +1 -0
  48. package/dist/file-queue/file-queue-process.js +85 -0
  49. package/dist/file-queue/file-queue-process.js.map +1 -0
  50. package/dist/file-queue/file-queue-process.test.d.ts +2 -0
  51. package/dist/file-queue/file-queue-process.test.d.ts.map +1 -0
  52. package/dist/file-queue/file-queue-process.test.js +373 -0
  53. package/dist/file-queue/file-queue-process.test.js.map +1 -0
  54. package/dist/file-queue/file-queue-settled.d.ts +13 -0
  55. package/dist/file-queue/file-queue-settled.d.ts.map +1 -0
  56. package/dist/file-queue/file-queue-settled.js +25 -0
  57. package/dist/file-queue/file-queue-settled.js.map +1 -0
  58. package/dist/file-queue/file-queue-settled.test.d.ts +2 -0
  59. package/dist/file-queue/file-queue-settled.test.d.ts.map +1 -0
  60. package/dist/file-queue/file-queue-settled.test.js +47 -0
  61. package/dist/file-queue/file-queue-settled.test.js.map +1 -0
  62. package/dist/file-queue/index.d.ts +2 -0
  63. package/dist/file-queue/index.d.ts.map +1 -0
  64. package/dist/file-queue/index.js +2 -0
  65. package/dist/file-queue/index.js.map +1 -0
  66. package/dist/file-queue/with-skip-file-queue.d.ts +3 -0
  67. package/dist/file-queue/with-skip-file-queue.d.ts.map +1 -0
  68. package/dist/file-queue/with-skip-file-queue.js +26 -0
  69. package/dist/file-queue/with-skip-file-queue.js.map +1 -0
  70. package/dist/file-queue/with-skip-file-queue.test.d.ts +2 -0
  71. package/dist/file-queue/with-skip-file-queue.test.d.ts.map +1 -0
  72. package/dist/file-queue/with-skip-file-queue.test.js +138 -0
  73. package/dist/file-queue/with-skip-file-queue.test.js.map +1 -0
  74. package/dist/index.d.ts +2 -2
  75. package/dist/index.d.ts.map +1 -1
  76. package/dist/index.js +2 -2
  77. package/dist/index.js.map +1 -1
  78. package/dist/key-value/database-schema.d.ts +11 -2
  79. package/dist/key-value/database-schema.d.ts.map +1 -1
  80. package/dist/key-value/database-schema.js +7 -4
  81. package/dist/key-value/database-schema.js.map +1 -1
  82. package/dist/key-value/database-schema.test.js +21 -5
  83. package/dist/key-value/database-schema.test.js.map +1 -1
  84. package/dist/lix/close-lix.d.ts +8 -0
  85. package/dist/lix/close-lix.d.ts.map +1 -0
  86. package/dist/lix/close-lix.js +7 -0
  87. package/dist/lix/close-lix.js.map +1 -0
  88. package/dist/lix/index.d.ts +1 -0
  89. package/dist/lix/index.d.ts.map +1 -1
  90. package/dist/lix/index.js +1 -0
  91. package/dist/lix/index.js.map +1 -1
  92. package/dist/lix/merge.js +3 -3
  93. package/dist/lix/merge.js.map +1 -1
  94. package/dist/lix/merge.test.js +7 -18
  95. package/dist/lix/merge.test.js.map +1 -1
  96. package/dist/lix/new-lix.d.ts.map +1 -1
  97. package/dist/lix/new-lix.js +2 -3
  98. package/dist/lix/new-lix.js.map +1 -1
  99. package/dist/lix/open-lix-in-memory.test.js +2 -1
  100. package/dist/lix/open-lix-in-memory.test.js.map +1 -1
  101. package/dist/lix/open-lix.d.ts +3 -5
  102. package/dist/lix/open-lix.d.ts.map +1 -1
  103. package/dist/lix/open-lix.js +4 -18
  104. package/dist/lix/open-lix.js.map +1 -1
  105. package/dist/lix/open-lix.test.js +16 -7
  106. package/dist/lix/open-lix.test.js.map +1 -1
  107. package/dist/lix/to-blob.d.ts +11 -0
  108. package/dist/lix/to-blob.d.ts.map +1 -0
  109. package/dist/lix/to-blob.js +11 -0
  110. package/dist/lix/to-blob.js.map +1 -0
  111. package/dist/own-change-control/apply-own-change.d.ts +10 -0
  112. package/dist/own-change-control/apply-own-change.d.ts.map +1 -0
  113. package/dist/own-change-control/apply-own-change.js +69 -0
  114. package/dist/own-change-control/apply-own-change.js.map +1 -0
  115. package/dist/own-change-control/apply-own-change.test.d.ts +2 -0
  116. package/dist/own-change-control/apply-own-change.test.d.ts.map +1 -0
  117. package/dist/own-change-control/apply-own-change.test.js +297 -0
  118. package/dist/own-change-control/apply-own-change.test.js.map +1 -0
  119. package/dist/own-change-control/change-controlled-tables.d.ts +60 -0
  120. package/dist/own-change-control/change-controlled-tables.d.ts.map +1 -0
  121. package/dist/own-change-control/change-controlled-tables.js +70 -0
  122. package/dist/own-change-control/change-controlled-tables.js.map +1 -0
  123. package/dist/own-change-control/change-controlled-tables.test.d.ts +2 -0
  124. package/dist/own-change-control/change-controlled-tables.test.d.ts.map +1 -0
  125. package/dist/own-change-control/change-controlled-tables.test.js +48 -0
  126. package/dist/own-change-control/change-controlled-tables.test.js.map +1 -0
  127. package/dist/own-change-control/database-triggers.d.ts +5 -0
  128. package/dist/own-change-control/database-triggers.d.ts.map +1 -0
  129. package/dist/own-change-control/database-triggers.js +135 -0
  130. package/dist/own-change-control/database-triggers.js.map +1 -0
  131. package/dist/own-change-control/database-triggers.test.d.ts +2 -0
  132. package/dist/own-change-control/database-triggers.test.d.ts.map +1 -0
  133. package/dist/own-change-control/database-triggers.test.js +214 -0
  134. package/dist/own-change-control/database-triggers.test.js.map +1 -0
  135. package/dist/own-change-control/index.d.ts +2 -0
  136. package/dist/own-change-control/index.d.ts.map +1 -0
  137. package/dist/own-change-control/index.js +2 -0
  138. package/dist/own-change-control/index.js.map +1 -0
  139. package/dist/own-change-control/with-skip-own-change-control.d.ts +3 -0
  140. package/dist/own-change-control/with-skip-own-change-control.d.ts.map +1 -0
  141. package/dist/own-change-control/with-skip-own-change-control.js +28 -0
  142. package/dist/own-change-control/with-skip-own-change-control.js.map +1 -0
  143. package/dist/own-change-control/with-skip-own-change-control.test.d.ts +2 -0
  144. package/dist/own-change-control/with-skip-own-change-control.test.d.ts.map +1 -0
  145. package/dist/own-change-control/with-skip-own-change-control.test.js +49 -0
  146. package/dist/own-change-control/with-skip-own-change-control.test.js.map +1 -0
  147. package/dist/own-entity-change-control/apply-own-entity-change.js +2 -2
  148. package/dist/own-entity-change-control/apply-own-entity-change.js.map +1 -1
  149. package/dist/own-entity-change-control/apply-own-entity-change.test.js +9 -9
  150. package/dist/own-entity-change-control/apply-own-entity-change.test.js.map +1 -1
  151. package/dist/own-entity-change-control/database-triggers.js +6 -6
  152. package/dist/own-entity-change-control/database-triggers.js.map +1 -1
  153. package/dist/own-entity-change-control/database-triggers.test.js +1 -1
  154. package/dist/own-entity-change-control/database-triggers.test.js.map +1 -1
  155. package/dist/query-filter/version-change-in-difference.test.js +37 -29
  156. package/dist/query-filter/version-change-in-difference.test.js.map +1 -1
  157. package/dist/query-filter/version-change-in-symmetric-difference.test.js +37 -39
  158. package/dist/query-filter/version-change-in-symmetric-difference.test.js.map +1 -1
  159. package/dist/server-api-handler/environment/create-in-memory-environment.d.ts.map +1 -1
  160. package/dist/server-api-handler/environment/create-in-memory-environment.js +7 -3
  161. package/dist/server-api-handler/environment/create-in-memory-environment.js.map +1 -1
  162. package/dist/server-api-handler/environment/create-in-memory-environment.test.js +8 -7
  163. package/dist/server-api-handler/environment/create-in-memory-environment.test.js.map +1 -1
  164. package/dist/server-api-handler/routes/get-v1.d.ts.map +1 -1
  165. package/dist/server-api-handler/routes/get-v1.js +1 -2
  166. package/dist/server-api-handler/routes/get-v1.js.map +1 -1
  167. package/dist/server-api-handler/routes/get-v1.test.js +6 -5
  168. package/dist/server-api-handler/routes/get-v1.test.js.map +1 -1
  169. package/dist/server-api-handler/routes/new-v1.d.ts.map +1 -1
  170. package/dist/server-api-handler/routes/new-v1.js +3 -1
  171. package/dist/server-api-handler/routes/new-v1.js.map +1 -1
  172. package/dist/server-api-handler/routes/new-v1.test.js +2 -1
  173. package/dist/server-api-handler/routes/new-v1.test.js.map +1 -1
  174. package/dist/server-api-handler/routes/pull-v1.test.js +4 -3
  175. package/dist/server-api-handler/routes/pull-v1.test.js.map +1 -1
  176. package/dist/server-api-handler/routes/push-v1.test.js +5 -4
  177. package/dist/server-api-handler/routes/push-v1.test.js.map +1 -1
  178. package/dist/sync/pull-from-server.d.ts.map +1 -1
  179. package/dist/sync/pull-from-server.js +0 -2
  180. package/dist/sync/pull-from-server.js.map +1 -1
  181. package/dist/sync/pull-from-server.test.js +29 -14
  182. package/dist/sync/pull-from-server.test.js.map +1 -1
  183. package/dist/sync/push-to-server.test.js +17 -13
  184. package/dist/sync/push-to-server.test.js.map +1 -1
  185. package/dist/sync/sync-process.d.ts +2 -4
  186. package/dist/sync/sync-process.d.ts.map +1 -1
  187. package/dist/sync/sync-process.js +4 -9
  188. package/dist/sync/sync-process.js.map +1 -1
  189. package/dist/sync/sync-process.test.js +26 -38
  190. package/dist/sync/sync-process.test.js.map +1 -1
  191. package/dist/version/create-version.d.ts +5 -5
  192. package/dist/version/create-version.d.ts.map +1 -1
  193. package/dist/version/create-version.js +23 -11
  194. package/dist/version/create-version.js.map +1 -1
  195. package/dist/version/create-version.test.js +2 -2
  196. package/dist/version/create-version.test.js.map +1 -1
  197. package/dist/version/merge-version.d.ts.map +1 -1
  198. package/dist/version/merge-version.js +16 -26
  199. package/dist/version/merge-version.js.map +1 -1
  200. package/dist/version/switch-version.js +3 -3
  201. package/dist/version/switch-version.js.map +1 -1
  202. package/dist/version/switch-version.test.js +12 -15
  203. package/dist/version/switch-version.test.js.map +1 -1
  204. package/dist/version/update-changes-in-version.d.ts.map +1 -1
  205. package/dist/version/update-changes-in-version.js +11 -31
  206. package/dist/version/update-changes-in-version.js.map +1 -1
  207. package/node_modules/@lix-js/server-api-schema/CHANGELOG.md +9 -0
  208. package/node_modules/@lix-js/server-api-schema/LICENSE +21 -0
  209. package/node_modules/@lix-js/server-api-schema/dist/schema.js +0 -0
  210. package/node_modules/@lix-js/server-api-schema/package.json +2 -2
  211. package/node_modules/sqlite-wasm-kysely/LICENSE +21 -0
  212. package/package.json +4 -4
  213. package/src/change/apply-changes.test.ts +7 -7
  214. package/src/change/apply-changes.ts +9 -9
  215. package/src/database/apply-schema.ts +20 -73
  216. package/src/database/execute-sync.test.ts +3 -3
  217. package/src/database/init-db.test.ts +163 -19
  218. package/src/database/init-db.ts +20 -3
  219. package/src/database/kysely-plugin/parse-jsonb-plugin-v1.ts +9 -2
  220. package/src/database/mutation-log/database-schema.ts +1 -3
  221. package/src/database/nano-id.test.ts +15 -0
  222. package/src/database/nano-id.ts +72 -0
  223. package/src/database/schema.ts +15 -24
  224. package/src/discussion/create-comment.ts +0 -3
  225. package/src/discussion/create-discussion.test.ts +8 -39
  226. package/src/discussion/create-discussion.ts +6 -9
  227. package/src/{change-queue → file-queue}/file-handlers.ts +27 -27
  228. package/src/{change-queue/init-change-queue.test.ts → file-queue/file-queue-process.test.ts} +24 -24
  229. package/src/{change-queue/init-change-queue.ts → file-queue/file-queue-process.ts} +18 -16
  230. package/src/{change-queue/change-queue-settled.test.ts → file-queue/file-queue-settled.test.ts} +12 -12
  231. package/src/{change-queue/change-queue-settled.ts → file-queue/file-queue-settled.ts} +4 -4
  232. package/src/file-queue/index.ts +1 -0
  233. package/src/{change-queue/with-skip-change-queue.test.ts → file-queue/with-skip-file-queue.test.ts} +9 -9
  234. package/src/{change-queue/with-skip-change-queue.ts → file-queue/with-skip-file-queue.ts} +3 -3
  235. package/src/index.ts +2 -2
  236. package/src/key-value/database-schema.test.ts +26 -5
  237. package/src/key-value/database-schema.ts +18 -6
  238. package/src/lix/close-lix.ts +8 -0
  239. package/src/lix/index.ts +1 -0
  240. package/src/lix/merge.test.ts +7 -19
  241. package/src/lix/merge.ts +4 -4
  242. package/src/lix/new-lix.ts +2 -3
  243. package/src/lix/open-lix-in-memory.test.ts +5 -1
  244. package/src/lix/open-lix.test.ts +19 -7
  245. package/src/lix/open-lix.ts +7 -24
  246. package/src/lix/to-blob.ts +14 -0
  247. package/src/{own-entity-change-control/apply-own-entity-change.test.ts → own-change-control/apply-own-change.test.ts} +27 -31
  248. package/src/{own-entity-change-control/apply-own-entity-change.ts → own-change-control/apply-own-change.ts} +3 -3
  249. package/src/{own-entity-change-control → own-change-control}/change-controlled-tables.ts +0 -1
  250. package/src/{own-entity-change-control → own-change-control}/database-triggers.test.ts +7 -7
  251. package/src/{own-entity-change-control → own-change-control}/database-triggers.ts +11 -11
  252. package/src/{own-entity-change-control → own-change-control}/with-skip-own-change-control.ts +6 -2
  253. package/src/query-filter/version-change-in-difference.test.ts +41 -32
  254. package/src/query-filter/version-change-in-symmetric-difference.test.ts +41 -42
  255. package/src/server-api-handler/environment/create-in-memory-environment.test.ts +8 -7
  256. package/src/server-api-handler/environment/create-in-memory-environment.ts +7 -3
  257. package/src/server-api-handler/routes/get-v1.test.ts +6 -5
  258. package/src/server-api-handler/routes/get-v1.ts +1 -3
  259. package/src/server-api-handler/routes/new-v1.test.ts +2 -1
  260. package/src/server-api-handler/routes/new-v1.ts +3 -1
  261. package/src/server-api-handler/routes/pull-v1.test.ts +4 -3
  262. package/src/server-api-handler/routes/push-v1.test.ts +5 -4
  263. package/src/sync/pull-from-server.test.ts +29 -14
  264. package/src/sync/pull-from-server.ts +0 -2
  265. package/src/sync/push-to-server.test.ts +19 -15
  266. package/src/sync/sync-process.test.ts +37 -43
  267. package/src/sync/sync-process.ts +6 -18
  268. package/src/version/create-version.test.ts +2 -2
  269. package/src/version/create-version.ts +24 -12
  270. package/src/version/merge-version.ts +18 -26
  271. package/src/version/switch-version.test.ts +12 -15
  272. package/src/version/switch-version.ts +3 -3
  273. package/src/version/update-changes-in-version.ts +11 -30
  274. package/node_modules/@lix-js/server-api-schema/dist/schema.d.ts +0 -384
  275. package/src/change-queue/index.ts +0 -1
  276. /package/src/{own-entity-change-control → own-change-control}/change-controlled-tables.test.ts +0 -0
  277. /package/src/{own-entity-change-control → own-change-control}/index.ts +0 -0
  278. /package/src/{own-entity-change-control → own-change-control}/with-skip-own-change-control.test.ts +0 -0
@@ -0,0 +1,138 @@
1
+ import { expect, test } from "vitest";
2
+ import { openLixInMemory } from "../lix/open-lix-in-memory.js";
3
+ import { fileQueueSettled } from "./file-queue-settled.js";
4
+ import { withSkipFileQueue } from "./with-skip-file-queue.js";
5
+ test("skipping the file queue should be possible", async () => {
6
+ const mockPlugin = {
7
+ key: "mock-plugin",
8
+ detectChangesGlob: "*",
9
+ detectChanges: async ({ after }) => {
10
+ const textAfter = after
11
+ ? new TextDecoder().decode(after.data)
12
+ : undefined;
13
+ return [
14
+ {
15
+ schema: {
16
+ key: "text",
17
+ type: "json",
18
+ },
19
+ entity_id: "test",
20
+ snapshot: { text: textAfter },
21
+ },
22
+ ];
23
+ },
24
+ };
25
+ const lix = await openLixInMemory({
26
+ providePlugins: [mockPlugin],
27
+ });
28
+ await lix.db
29
+ .insertInto("file")
30
+ .values({
31
+ id: "test",
32
+ data: new TextEncoder().encode("update0"),
33
+ path: "/test.txt",
34
+ })
35
+ .execute();
36
+ await fileQueueSettled({ lix });
37
+ const changes0 = await lix.db
38
+ .selectFrom("change")
39
+ .innerJoin("snapshot", "snapshot.id", "change.snapshot_id")
40
+ .where("schema_key", "=", "text")
41
+ .selectAll()
42
+ .execute();
43
+ expect(changes0).toHaveLength(1);
44
+ expect(changes0[0]?.content).toEqual({ text: "update0" });
45
+ await withSkipFileQueue(lix.db, async (trx) => {
46
+ await trx
47
+ .updateTable("file")
48
+ .set({
49
+ data: new TextEncoder().encode("update1"),
50
+ })
51
+ .where("id", "=", "test")
52
+ .execute();
53
+ });
54
+ await fileQueueSettled({ lix });
55
+ const changes1 = await lix.db
56
+ .selectFrom("change")
57
+ .innerJoin("snapshot", "snapshot.id", "change.snapshot_id")
58
+ .selectAll()
59
+ .where("schema_key", "=", "text")
60
+ .execute();
61
+ // change is skipped, so no new change is created
62
+ expect(changes1).toHaveLength(1);
63
+ expect(changes1[0]?.content).toEqual({ text: "update0" });
64
+ });
65
+ test("skipping the file queue should be possible with multiple changes", async () => {
66
+ const mockPlugin = {
67
+ key: "mock-plugin",
68
+ detectChangesGlob: "*",
69
+ detectChanges: async ({ after }) => {
70
+ const textAfter = after
71
+ ? new TextDecoder().decode(after.data)
72
+ : undefined;
73
+ return [
74
+ {
75
+ schema: {
76
+ key: "text",
77
+ type: "json",
78
+ },
79
+ entity_id: "test",
80
+ snapshot: { text: textAfter },
81
+ },
82
+ ];
83
+ },
84
+ };
85
+ const lix = await openLixInMemory({
86
+ providePlugins: [mockPlugin],
87
+ });
88
+ await lix.db
89
+ .insertInto("file")
90
+ .values({
91
+ id: "test",
92
+ data: new TextEncoder().encode("initial"),
93
+ path: "/test.txt",
94
+ })
95
+ .execute();
96
+ const manyUpdates = Array.from({ length: 100 }, (_, i) => `update${i}`);
97
+ const first50Updates = manyUpdates.slice(0, 50);
98
+ const last50Updates = manyUpdates.slice(50);
99
+ await lix.db.transaction().execute(async (trx) => {
100
+ for (const update of first50Updates) {
101
+ await trx
102
+ .updateTable("file")
103
+ .set({
104
+ data: new TextEncoder().encode(update),
105
+ })
106
+ .where("id", "=", "test")
107
+ .execute();
108
+ }
109
+ for (const update of last50Updates) {
110
+ await withSkipFileQueue(trx, async (trx) => {
111
+ await trx
112
+ .updateTable("file")
113
+ .set({
114
+ data: new TextEncoder().encode(update),
115
+ })
116
+ .where("id", "=", "test")
117
+ .execute();
118
+ });
119
+ }
120
+ });
121
+ await fileQueueSettled({ lix });
122
+ const file = await lix.db
123
+ .selectFrom("file")
124
+ .selectAll()
125
+ .where("id", "=", "test")
126
+ .executeTakeFirstOrThrow();
127
+ const changes = await lix.db
128
+ .selectFrom("change")
129
+ .innerJoin("snapshot", "snapshot.id", "change.snapshot_id")
130
+ .where("file_id", "=", file.id)
131
+ .selectAll()
132
+ .execute();
133
+ // expecting the latest change
134
+ expect(file.data).toEqual(new TextEncoder().encode("update99"));
135
+ // and only 50 changes + 1 insert change have been created
136
+ expect(changes).toHaveLength(51);
137
+ });
138
+ //# sourceMappingURL=with-skip-file-queue.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"with-skip-file-queue.test.js","sourceRoot":"","sources":["../../src/file-queue/with-skip-file-queue.test.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -2,13 +2,13 @@ export * from "./account/index.js";
2
2
  export * from "./change/index.js";
3
3
  export * from "./change-set/index.js";
4
4
  export * from "./change-conflict/index.js";
5
- export * from "./change-queue/index.js";
5
+ export * from "./file-queue/index.js";
6
6
  export * from "./change-schema/index.js";
7
7
  export * from "./database/index.js";
8
8
  export * from "./discussion/index.js";
9
9
  export * from "./file/index.js";
10
10
  export * from "./lix/index.js";
11
- export * from "./own-entity-change-control/index.js";
11
+ export * from "./own-change-control/index.js";
12
12
  export * from "./plugin/index.js";
13
13
  export * from "./query-filter/index.js";
14
14
  export * from "./server-api-handler/index.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sCAAsC,CAAC;AACrD,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC"}
package/dist/index.js CHANGED
@@ -2,13 +2,13 @@ export * from "./account/index.js";
2
2
  export * from "./change/index.js";
3
3
  export * from "./change-set/index.js";
4
4
  export * from "./change-conflict/index.js";
5
- export * from "./change-queue/index.js";
5
+ export * from "./file-queue/index.js";
6
6
  export * from "./change-schema/index.js";
7
7
  export * from "./database/index.js";
8
8
  export * from "./discussion/index.js";
9
9
  export * from "./file/index.js";
10
10
  export * from "./lix/index.js";
11
- export * from "./own-entity-change-control/index.js";
11
+ export * from "./own-change-control/index.js";
12
12
  export * from "./plugin/index.js";
13
13
  export * from "./query-filter/index.js";
14
14
  export * from "./server-api-handler/index.js";
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sCAAsC,CAAC;AACrD,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC"}
@@ -1,4 +1,4 @@
1
- import type { Insertable, Selectable, Updateable } from "kysely";
1
+ import type { Generated, Insertable, Selectable, Updateable } from "kysely";
2
2
  import type { SqliteDatabase } from "sqlite-wasm-kysely";
3
3
  export declare function applyKeyValueDatabaseSchema(sqlite: SqliteDatabase): SqliteDatabase;
4
4
  export type KeyValue = Selectable<KeyValueTable>;
@@ -25,8 +25,17 @@ export type KeyValueTable = {
25
25
  *
26
26
  */
27
27
  value: string;
28
+ /**
29
+ * If `true`, the key-value pair is not tracked with own change control.
30
+ *
31
+ * Carefull (!) when querying the database. The return value will be `0` or `1`.
32
+ * SQLite does not have a boolean select type https://www.sqlite.org/datatype3.html.
33
+ *
34
+ * @default false
35
+ */
36
+ skip_change_control: Generated<boolean>;
28
37
  };
29
- type PredefinedKeys = "lix_id" | "lix_server_url" | "#lix_sync";
38
+ type PredefinedKeys = "lix_id" | "lix_server_url" | "lix_sync";
30
39
  type KeyType = string & {};
31
40
  type KeyValueKeys = PredefinedKeys | KeyType;
32
41
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"database-schema.d.ts","sourceRoot":"","sources":["../../src/key-value/database-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,wBAAgB,2BAA2B,CAC1C,MAAM,EAAE,cAAc,GACpB,cAAc,CAgBhB;AAED,MAAM,MAAM,QAAQ,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;AACpD,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;AACvD,MAAM,MAAM,aAAa,GAAG;IAC3B;;;;;;;OAOG;IACH,GAAG,EAAE,YAAY,CAAC;IAClB;;;;;;;;;OASG;IACH,KAAK,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,cAAc,GAAG,QAAQ,GAAG,gBAAgB,GAAG,WAAW,CAAC;AAGhE,KAAK,OAAO,GAAG,MAAM,GAAG,EAAE,CAAC;AAC3B,KAAK,YAAY,GAAG,cAAc,GAAG,OAAO,CAAC"}
1
+ {"version":3,"file":"database-schema.d.ts","sourceRoot":"","sources":["../../src/key-value/database-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,wBAAgB,2BAA2B,CAC1C,MAAM,EAAE,cAAc,GACpB,cAAc,CAmBhB;AAED,MAAM,MAAM,QAAQ,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;AACpD,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;AACvD,MAAM,MAAM,aAAa,GAAG;IAC3B;;;;;;;OAOG;IACH,GAAG,EAAE,YAAY,CAAC;IAClB;;;;;;;;;OASG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;;OAOG;IACH,mBAAmB,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;CACxC,CAAC;AAEF,KAAK,cAAc,GAAG,QAAQ,GAAG,gBAAgB,GAAG,UAAU,CAAC;AAG/D,KAAK,OAAO,GAAG,MAAM,GAAG,EAAE,CAAC;AAC3B,KAAK,YAAY,GAAG,cAAc,GAAG,OAAO,CAAC"}
@@ -2,17 +2,20 @@ export function applyKeyValueDatabaseSchema(sqlite) {
2
2
  return sqlite.exec `
3
3
  CREATE TABLE IF NOT EXISTS key_value (
4
4
  key TEXT PRIMARY KEY,
5
- value TEXT NOT NULL
5
+ value TEXT NOT NULL,
6
+
7
+ -- Options
8
+ skip_change_control INT DEFAULT FALSE
6
9
  ) STRICT;
7
10
 
8
11
  INSERT OR IGNORE INTO key_value (key, value)
9
- VALUES ('lix_id', uuid_v4());
12
+ VALUES ('lix_id', nano_id(18));
10
13
 
11
14
  -- default value for lix sync to false
12
15
  -- if not exist to remove conditional logic
13
16
  -- if the key exists or not
14
- INSERT OR IGNORE INTO key_value (key, value)
15
- VALUES ('#lix_sync', 'false');
17
+ INSERT OR IGNORE INTO key_value (key, value, skip_change_control)
18
+ VALUES ('lix_sync', 'false', 1);
16
19
  `;
17
20
  }
18
21
  //# sourceMappingURL=database-schema.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"database-schema.js","sourceRoot":"","sources":["../../src/key-value/database-schema.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,2BAA2B,CAC1C,MAAsB;IAEtB,OAAO,MAAM,CAAC,IAAI,CAAA;;;;;;;;;;;;;;CAclB,CAAC;AACF,CAAC"}
1
+ {"version":3,"file":"database-schema.js","sourceRoot":"","sources":["../../src/key-value/database-schema.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,2BAA2B,CAC1C,MAAsB;IAEtB,OAAO,MAAM,CAAC,IAAI,CAAA;;;;;;;;;;;;;;;;;CAiBlB,CAAC;AACF,CAAC"}
@@ -1,7 +1,6 @@
1
1
  import { sql } from "kysely";
2
2
  import { expect, test } from "vitest";
3
3
  import { openLixInMemory } from "../lix/open-lix-in-memory.js";
4
- import { validate as validateUuid } from "uuid";
5
4
  test("string values are accepted", async () => {
6
5
  const lix = await openLixInMemory({});
7
6
  const result = await lix.db
@@ -77,22 +76,39 @@ test("using json as value should work", async () => {
77
76
  bar: "baz",
78
77
  });
79
78
  });
80
- test("it should default add a uuid lix_id if not exits", async () => {
79
+ // 1919T IDs needed, in order to have a 1% probability of at least one collision.
80
+ test("it should default add nano_id(18) for the lix_id if not exits", async () => {
81
81
  const lix = await openLixInMemory({});
82
82
  const result = await lix.db
83
83
  .selectFrom("key_value")
84
84
  .where("key", "=", "lix_id")
85
85
  .selectAll()
86
86
  .executeTakeFirstOrThrow();
87
- expect(validateUuid(result.value)).toBe(true);
87
+ expect(result.value).toHaveLength(18);
88
88
  });
89
- test("default value for #lix_sync to reduce conditional logic (the key is always set)", async () => {
89
+ test("default value for lix_sync to reduce conditional logic (the key is always set)", async () => {
90
90
  const lix = await openLixInMemory({});
91
91
  const result = await lix.db
92
92
  .selectFrom("key_value")
93
- .where("key", "=", "#lix_sync")
93
+ .where("key", "=", "lix_sync")
94
94
  .selectAll()
95
95
  .executeTakeFirstOrThrow();
96
96
  expect(result.value).toBe("false");
97
97
  });
98
+ test("skip_change_control should default to false", async () => {
99
+ const lix = await openLixInMemory({});
100
+ const result = await lix.db
101
+ .insertInto("key_value")
102
+ .values({ key: "mock_key", value: "mock_value" })
103
+ .returningAll()
104
+ .executeTakeFirstOrThrow();
105
+ expect(result.skip_change_control).toBeFalsy();
106
+ const updated = await lix.db
107
+ .updateTable("key_value")
108
+ .set({ skip_change_control: true })
109
+ .where("key", "=", "mock_key")
110
+ .returningAll()
111
+ .executeTakeFirstOrThrow();
112
+ expect(updated.skip_change_control).toBeTruthy();
113
+ });
98
114
  //# sourceMappingURL=database-schema.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"database-schema.test.js","sourceRoot":"","sources":["../../src/key-value/database-schema.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"database-schema.test.js","sourceRoot":"","sources":["../../src/key-value/database-schema.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,8 @@
1
+ import type { Lix } from "./open-lix.js";
2
+ /**
3
+ * Closes the lix.
4
+ */
5
+ export declare function closeLix(args: {
6
+ lix: Pick<Lix, "db">;
7
+ }): Promise<void>;
8
+ //# sourceMappingURL=close-lix.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"close-lix.d.ts","sourceRoot":"","sources":["../../src/lix/close-lix.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEzC;;GAEG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE;IAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5E"}
@@ -0,0 +1,7 @@
1
+ /**
2
+ * Closes the lix.
3
+ */
4
+ export async function closeLix(args) {
5
+ await args.lix.db.destroy();
6
+ }
7
+ //# sourceMappingURL=close-lix.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"close-lix.js","sourceRoot":"","sources":["../../src/lix/close-lix.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,IAA8B;IAC5D,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC;AAC7B,CAAC"}
@@ -1,4 +1,5 @@
1
1
  export { type Lix, openLix } from "./open-lix.js";
2
2
  export { openLixInMemory } from "./open-lix-in-memory.js";
3
3
  export { newLixFile } from "./new-lix.js";
4
+ export { toBlob } from "./to-blob.js";
4
5
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC"}
package/dist/lix/index.js CHANGED
@@ -1,6 +1,7 @@
1
1
  export { openLix } from "./open-lix.js";
2
2
  export { openLixInMemory } from "./open-lix-in-memory.js";
3
3
  export { newLixFile } from "./new-lix.js";
4
+ export { toBlob } from "./to-blob.js";
4
5
  // not exporting merge for api stability milestone
5
6
  // will need an overhaul to be stable
6
7
  // export { merge } from "./merge.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,kDAAkD;AAClD,qCAAqC;AACrC,sCAAsC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,kDAAkD;AAClD,qCAAqC;AACrC,sCAAsC"}
package/dist/lix/merge.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { getLeafChangesOnlyInSource } from "./merge.get-leaf-changes-only-in-source.js";
2
- import { withSkipChangeQueue } from "../change-queue/with-skip-change-queue.js";
2
+ import { withSkipFileQueue } from "../file-queue/with-skip-file-queue.js";
3
3
  /**
4
4
  * Combined the changes of the source lix into the target lix.
5
5
  */
@@ -57,7 +57,7 @@ export async function merge(args) {
57
57
  data: file.data,
58
58
  metadata: file.metadata,
59
59
  };
60
- await withSkipChangeQueue(args.targetLix.db, async (trx) => {
60
+ await withSkipFileQueue(args.targetLix.db, async (trx) => {
61
61
  await trx
62
62
  .insertInto("file")
63
63
  .values({ ...fileToInsert })
@@ -139,7 +139,7 @@ export async function merge(args) {
139
139
  }
140
140
  for (const [fileId, fileData] of Object.entries(changesPerFile)) {
141
141
  // update the file data with the applied changes
142
- await withSkipChangeQueue(trx, async (trx) => {
142
+ await withSkipFileQueue(trx, async (trx) => {
143
143
  await trx
144
144
  .updateTable("file")
145
145
  .set("data", fileData)
@@ -1 +1 @@
1
- {"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/lix/merge.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/lix/merge.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,8 @@ import { mockJsonSnapshot } from "../snapshot/mock-json-snapshot.js";
6
6
  import { createChangeSet } from "../change-set/create-change-set.js";
7
7
  import { createDiscussion } from "../discussion/create-discussion.js";
8
8
  import { createComment } from "../discussion/create-comment.js";
9
- import { changeQueueSettled } from "../change-queue/change-queue-settled.js";
9
+ import { fileQueueSettled } from "../file-queue/file-queue-settled.js";
10
+ import { toBlob } from "./to-blob.js";
10
11
  test("it should copy changes from the sourceLix into the targetLix that do not exist in targetLix yet", async () => {
11
12
  const mockSnapshots = [
12
13
  mockJsonSnapshot({ id: "mock-id", color: "red" }),
@@ -353,7 +354,7 @@ test.todo("it should apply changes that are not conflicting", async () => {
353
354
  data: new TextEncoder().encode(JSON.stringify({})),
354
355
  })
355
356
  .execute();
356
- await changeQueueSettled({ lix: targetLix });
357
+ await fileQueueSettled({ lix: targetLix });
357
358
  await merge({ sourceLix, targetLix });
358
359
  const changes = await targetLix.db
359
360
  .selectFrom("change")
@@ -551,10 +552,10 @@ test("it should copy discussion and related comments and mappings", async () =>
551
552
  data: enc.encode("inserted text"),
552
553
  })
553
554
  .execute();
554
- await changeQueueSettled({ lix: lix1 });
555
+ await fileQueueSettled({ lix: lix1 });
555
556
  // The files have to be there before we merge
556
557
  const lix2 = await openLixInMemory({
557
- blob: await lix1.toBlob(),
558
+ blob: await toBlob({ lix: lix1 }),
558
559
  providePlugins: [mockPlugin],
559
560
  });
560
561
  const changes = await lix1.db
@@ -578,16 +579,10 @@ test("it should copy discussion and related comments and mappings", async () =>
578
579
  },
579
580
  }),
580
581
  ]));
581
- // TODO how do know which author to use for the discussion - we can have multiple active accounts?
582
- const currentAuthorLix1 = await lix1.db
583
- .selectFrom("active_account")
584
- .selectAll()
585
- .executeTakeFirstOrThrow();
586
582
  await createDiscussion({
587
583
  lix: lix1,
588
584
  changeSet: await createChangeSet({ lix: lix1, changes: [changes[0]] }),
589
- content: "comment on a change",
590
- createdBy: { id: currentAuthorLix1.id },
585
+ firstComment: { content: "comment on a change" },
591
586
  });
592
587
  await merge({ sourceLix: lix1, targetLix: lix2 });
593
588
  const commentsLix2AfterMerge = await lix2.db
@@ -600,21 +595,15 @@ test("it should copy discussion and related comments and mappings", async () =>
600
595
  .execute();
601
596
  // lix 2 has no comments yet so after lix 1 into 2 we should be in sync
602
597
  expect(commentsLix1).toEqual(commentsLix2AfterMerge);
603
- const currentAuthorLix2 = await lix1.db
604
- .selectFrom("active_account")
605
- .selectAll()
606
- .executeTakeFirstOrThrow();
607
598
  await createComment({
608
599
  lix: lix2,
609
600
  parentComment: commentsLix2AfterMerge[0],
610
601
  content: "wrote in lix 2",
611
- createdBy: { id: currentAuthorLix2.id },
612
602
  });
613
603
  await createComment({
614
604
  lix: lix1,
615
605
  parentComment: commentsLix2AfterMerge[0],
616
606
  content: "wrote in lix 1",
617
- createdBy: { id: currentAuthorLix1.id },
618
607
  });
619
608
  const commentsLix1OnSecondMerge = await lix1.db
620
609
  .selectFrom("comment")
@@ -657,7 +646,7 @@ test.skip("it should copy change sets and merge memberships", async () => {
657
646
  changes: [mockChanges[0]],
658
647
  });
659
648
  const sourceLix = await openLixInMemory({
660
- blob: await targetLix.toBlob(),
649
+ blob: await toBlob({ lix: targetLix }),
661
650
  });
662
651
  // expand the change set to contain another change
663
652
  // to test if the sets are merged
@@ -1 +1 @@
1
- {"version":3,"file":"merge.test.js","sourceRoot":"","sources":["../../src/lix/merge.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAQnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAE7E,IAAI,CAAC,iGAAiG,EAAE,KAAK,IAAI,EAAE;IAClH,MAAM,aAAa,GAAG;QACrB,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QACjD,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAClD,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;KACnD,CAAC;IAEF,MAAM,WAAW,GAAgB;QAChC;YACC,EAAE,EAAE,GAAG;YACP,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAE,CAAC,EAAE;YACjC,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,aAAa;SACzB;QACD;YACC,EAAE,EAAE,GAAG;YACP,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAE,CAAC,EAAE;YACjC,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,aAAa;SACzB;QACD;YACC,EAAE,EAAE,GAAG;YACP,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAE,CAAC,EAAE;YACjC,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,aAAa;SACzB;KACD,CAAC;IAEF,MAAM,SAAS,GAAiB,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;IAEpE,MAAM,UAAU,GAAc;QAC7B,GAAG,EAAE,aAAa;QAClB,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAC9C,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,QAAQ,EAAE,IAAI,UAAU,EAAE,EAAE,CAAC;KACvE,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;QACvC,IAAI,EAAE,MAAM,UAAU,EAAE;QACxB,cAAc,EAAE,CAAC,UAAU,CAAC;KAC5B,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;QACvC,IAAI,EAAE,MAAM,UAAU,EAAE;QACxB,cAAc,EAAE,CAAC,UAAU,CAAC;KAC5B,CAAC,CAAC;IAEH,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,UAAU,CAAC;SACtB,MAAM,CACN,CAAC,aAAa,CAAC,CAAC,CAAE,EAAE,aAAa,CAAC,CAAC,CAAE,EAAE,aAAa,CAAC,CAAC,CAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACrE,OAAO,EAAE,CAAC,CAAC,OAAO;KAClB,CAAC,CAAC,CACH;SACA,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC,CAAE,EAAE,WAAW,CAAC,CAAC,CAAE,EAAE,WAAW,CAAC,CAAC,CAAE,CAAC,CAAC;SAC3D,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,aAAa,CAAC;SACzB,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,CAAE,CAAC,CAAC;SACvB,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,UAAU,CAAC;SACtB,MAAM,CACN,CAAC,aAAa,CAAC,CAAC,CAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7B,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC,CAAC,CACF;SACA,OAAO,EAAE,CAAC;IACZ,MAAM,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAE5E,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,MAAM,CAAC;SAClB,MAAM,CAAC;QACP,EAAE,EAAE,WAAW;QACf,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;KAClD,CAAC;SACD,OAAO,EAAE,CAAC;IAEZ,MAAM,KAAK,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,EAAE;SAChC,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,IAAI,CAAC;SACZ,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,MAAM,CAAC;SAChC,OAAO,EAAE,CAAC;IAEZ,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC9C,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE;QAClB,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE;QAClB,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE;KAClB,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,EAAE;SAClC,UAAU,CAAC,UAAU,CAAC;SACtB,MAAM,CAAC,IAAI,CAAC;SACZ,OAAO,EAAE,CAAC;IAEZ,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAC/C,MAAM,CAAC,eAAe,CAAC;QACtB,YAAY;QACZ,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE;QACpB,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE;QACpB,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE;KACpB,CAAC,CACF,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,EAAE;SAC9B,UAAU,CAAC,aAAa,CAAC;SACzB,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IAEZ,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CACpB,MAAM,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC/D,CAAC;IAEF,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACzD,+DAA+D;AAChE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,IAAI,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;IACvD,MAAM,aAAa,GAAG;QACrB,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QACjD,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAClD,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;KACnD,CAAC;IAEF,MAAM,WAAW,GAAgB;QAChC;YACC,EAAE,EAAE,GAAG;YACP,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAE,CAAC,EAAE;YACjC,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,aAAa;SACzB;QACD;YACC,EAAE,EAAE,GAAG;YACP,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAE,CAAC,EAAE;YACjC,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,aAAa;SACzB;QACD;YACC,EAAE,EAAE,GAAG;YACP,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAE,CAAC,EAAE;YACjC,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,aAAa;SACzB;KACD,CAAC;IAEF,MAAM,UAAU,GAAc;QAC7B,GAAG,EAAE,aAAa;QAClB,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;YAC1C;gBACC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAE,CAAC,EAAG;gBAC9B,qBAAqB,EAAE,WAAW,CAAC,CAAC,CAAE,CAAC,EAAG;aAC1C;SACD,CAAC;QACF,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,QAAQ,EAAE,IAAI,UAAU,EAAE,EAAE,CAAC;KACvE,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;QACvC,IAAI,EAAE,MAAM,UAAU,EAAE;QACxB,cAAc,EAAE,CAAC,UAAU,CAAC;KAC5B,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;QACvC,IAAI,EAAE,MAAM,UAAU,EAAE;QACxB,cAAc,EAAE,CAAC,UAAU,CAAC;KAC5B,CAAC,CAAC;IAEH,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC,CAAE,EAAE,WAAW,CAAC,CAAC,CAAE,CAAC,CAAC;SAC1C,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,UAAU,CAAC;SACtB,MAAM,CACN,CAAC,aAAa,CAAC,CAAC,CAAE,EAAE,aAAa,CAAC,CAAC,CAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAChD,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC,CAAC,CACF;SACA,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC,CAAE,EAAE,WAAW,CAAC,CAAC,CAAE,CAAC,CAAC;SAC1C,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,UAAU,CAAC;SACtB,MAAM,CACN,CAAC,aAAa,CAAC,CAAC,CAAE,EAAE,aAAa,CAAC,CAAC,CAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAChD,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC,CAAC,CACF;SACA,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,MAAM,CAAC;SAClB,MAAM,CAAC;QACP,EAAE,EAAE,WAAW;QACf,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;KAClD,CAAC;SACD,OAAO,EAAE,CAAC;IAEZ,MAAM,KAAK,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IAEtC,uCAAuC;IACvC,2BAA2B;IAC3B,mDAAmD;IACnD,eAAe;IAEf,oCAAoC;IACpC,iCAAiC;IACjC,kCAAkC;IAClC,8CAA8C;IAC9C,MAAM;AACP,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;IAC/F,MAAM,eAAe,GAAG,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAE5E,MAAM,aAAa,GAAgB;QAClC;YACC,EAAE,EAAE,GAAG;YACP,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,eAAe,CAAC,CAAC,CAAE,CAAC,EAAE;YACnC,SAAS,EAAE,QAAQ;YACnB,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,aAAa;SACzB;KACD,CAAC;IAEF,MAAM,wBAAwB,GAAkB,EAAE,CAAC;IACnD,MAAM,sBAAsB,GAAgB,EAAE,CAAC;IAE/C,MAAM,wBAAwB,GAAe;QAC5C,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;KAClD,CAAC;IACF,MAAM,sBAAsB,GAAgB;QAC3C;YACC,EAAE,EAAE,GAAG;YACP,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,wBAAwB,CAAC,CAAC,CAAE,CAAC,EAAE;YAC5C,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,aAAa;SACzB;KACD,CAAC;IAEF,MAAM,qBAAqB,GAAc;QACxC,GAAG,EAAE,aAAa;QAClB,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAC5C,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAC9C,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,QAAQ,EAAE,IAAI,UAAU,EAAE,EAAE,CAAC;KACvE,CAAC;IAEF,MAAM,qBAAqB,GAAc;QACxC,GAAG,EAAE,aAAa;QAClB,iBAAiB,EAAE,GAAG;QACtB,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAC5C,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAC9C,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,QAAQ,EAAE,IAAI,UAAU,EAAE,EAAE,CAAC;KACvE,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;QACvC,IAAI,EAAE,MAAM,UAAU,EAAE;QACxB,cAAc,EAAE,CAAC,qBAAqB,CAAC;KACvC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;QACvC,IAAI,EAAE,MAAM,UAAU,EAAE;QACxB,cAAc,EAAE,CAAC,qBAAqB,CAAC;KACvC,CAAC,CAAC;IAEH,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,UAAU,CAAC;SACtB,MAAM,CACN,CAAC,GAAG,eAAe,EAAE,GAAG,wBAAwB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC3D,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC,CAAC,CACF;SACA,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,CAAC,GAAG,aAAa,EAAE,GAAG,sBAAsB,CAAC,CAAC;SACrD,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,UAAU,CAAC;SACtB,MAAM,CACN,CAAC,GAAG,eAAe,EAAE,GAAG,wBAAwB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC3D,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC,CAAC,CACF;SACA,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,CAAC,GAAG,aAAa,EAAE,GAAG,sBAAsB,CAAC,CAAC;SACrD,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,MAAM,CAAC;SAClB,MAAM,CAAC;QACP,EAAE,EAAE,WAAW;QACf,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;KAClD,CAAC;SACD,OAAO,EAAE,CAAC;IAEZ,MAAM,KAAK,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IAEtC,MAAM,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACrE,gCAAgC;IAChC,MAAM,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC,CAAC;AAEH,8CAA8C;AAC9C,IAAI,CAAC,IAAI,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;IACxE,MAAM,aAAa,GAAe;QACjC,gBAAgB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QAClC,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;KACnC,CAAC;IAEF,MAAM,WAAW,GAAgB;QAChC;YACC,EAAE,EAAE,GAAG;YACP,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAE,CAAC,EAAE;YACjC,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,aAAa;SACzB;QACD;YACC,EAAE,EAAE,GAAG;YACP,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,aAAa,CAAC,CAAC,CAAE,CAAC,EAAE;YACjC,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,aAAa;SACzB;KACD,CAAC;IAEF,MAAM,KAAK,GAAiB,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;IAEhE,MAAM,UAAU,GAAc;QAC7B,GAAG,EAAE,aAAa;QAClB,YAAY,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE;YACxC,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,EAAE;iBAC3B,UAAU,CAAC,UAAU,CAAC;iBACtB,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,UAAW,CAAC,WAAW,CAAC;iBACzC,SAAS,EAAE;iBACX,uBAAuB,EAAE,CAAC;YAC5B,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CACxC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC,CACtC,CAAC;YACF,OAAO,EAAE,QAAQ,EAAE,CAAC;QACrB,CAAC;KACD,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;QACvC,IAAI,EAAE,MAAM,UAAU,EAAE;QACxB,cAAc,EAAE,CAAC,UAAU,CAAC;KAC5B,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;QACvC,IAAI,EAAE,MAAM,UAAU,EAAE;QACxB,cAAc,EAAE,CAAC,UAAU,CAAC;KAC5B,CAAC,CAAC;IAEH,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,UAAU,CAAC;SACtB,MAAM,CACN,CAAC,aAAa,CAAC,CAAC,CAAE,EAAE,aAAa,CAAC,CAAC,CAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAClD,OAAO,EAAE,CAAC,CAAC,OAAO;KAClB,CAAC,CAAC,CACH;SACA,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC,CAAE,EAAE,WAAW,CAAC,CAAC,CAAE,CAAC,CAAC;SAC1C,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAE3E,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,UAAU,CAAC;SACtB,MAAM,CACN,CAAC,aAAa,CAAC,CAAC,CAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7B,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC,CAAC,CACF;SACA,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAE5E,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,MAAM,CAAC;SAClB,MAAM,CAAC;QACP,EAAE,EAAE,WAAW;QACf,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;KAClD,CAAC;SACD,OAAO,EAAE,CAAC;IAEZ,MAAM,kBAAkB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;IAE7C,MAAM,KAAK,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,EAAE;SAChC,UAAU,CAAC,QAAQ,CAAC;SACpB,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,oBAAoB,CAAC;SAC1D,SAAS,CAAC,QAAQ,CAAC;SACnB,MAAM,CAAC,kBAAkB,CAAC;SAC1B,OAAO,EAAE,CAAC;IAEZ,uCAAuC;IACvC,2BAA2B;IAC3B,gBAAgB;IAChB,eAAe;IAEf,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,EAAE;SAC7B,UAAU,CAAC,MAAM,CAAC;SAClB,SAAS,EAAE;SACX,uBAAuB,EAAE,CAAC;IAE5B,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/B,oCAAoC;IACpC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CACxB,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAE,CAAC,OAAQ,CAAC,CAAC,CACpE,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,IAAI,CACR,yEAAyE,EACzE,KAAK,IAAI,EAAE;IACV,MAAM,eAAe,GAAG,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC5E,MAAM,aAAa,GAAgB;QAClC;YACC,EAAE,EAAE,GAAG;YACP,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,eAAe,CAAC,CAAC,CAAE,CAAC,EAAE;YACnC,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,aAAa;SACzB;KACD,CAAC;IACF,MAAM,wBAAwB,GAAkB,EAAE,CAAC;IACnD,MAAM,sBAAsB,GAAgB,EAAE,CAAC;IAE/C,MAAM,wBAAwB,GAAe;QAC5C,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;KAClD,CAAC;IACF,MAAM,sBAAsB,GAAgB;QAC3C;YACC,EAAE,EAAE,GAAG;YACP,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,wBAAwB,CAAC,CAAC,CAAE,CAAC,EAAE;YAC5C,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,aAAa;SACzB;KACD,CAAC;IAEF,MAAM,UAAU,GAAc;QAC7B,GAAG,EAAE,aAAa;QAClB,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;YAC1C;gBACC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAE,CAAC,EAAG;gBAChC,qBAAqB,EAAE,sBAAsB,CAAC,CAAC,CAAE,CAAC,EAAG;aACrD;SACD,CAAC;QACF,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,QAAQ,EAAE,IAAI,UAAU,EAAE,EAAE,CAAC;KACvE,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;QACvC,IAAI,EAAE,MAAM,UAAU,EAAE;QACxB,cAAc,EAAE,CAAC,UAAU,CAAC;KAC5B,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;QACvC,IAAI,EAAE,MAAM,UAAU,EAAE;QACxB,cAAc,EAAE,CAAC,UAAU,CAAC;KAC5B,CAAC,CAAC;IAEH,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,UAAU,CAAC;SACtB,MAAM,CACN,CAAC,GAAG,eAAe,EAAE,GAAG,wBAAwB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC3D,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC,CAAC,CACF;SACA,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,CAAC,GAAG,aAAa,EAAE,GAAG,sBAAsB,CAAC,CAAC;SACrD,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,UAAU,CAAC;SACtB,MAAM,CACN,CAAC,GAAG,eAAe,EAAE,GAAG,wBAAwB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC3D,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC,CAAC,CACF;SACA,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,CAAC,GAAG,aAAa,EAAE,GAAG,sBAAsB,CAAC,CAAC;SACrD,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,MAAM,CAAC;SAClB,MAAM,CAAC;QACP,EAAE,EAAE,WAAW;QACf,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;KAClD,CAAC;SACD,OAAO,EAAE,CAAC;IAEZ,MAAM,KAAK,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,EAAE;SAChC,UAAU,CAAC,QAAQ,CAAC;SACpB,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IAEZ,uCAAuC;IACvC,2BAA2B;IAC3B,gBAAgB;IAChB,eAAe;IAEf,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/B,oCAAoC;IAEpC,MAAM,KAAK,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IAEtC,MAAM,uBAAuB,GAAG,MAAM,SAAS,CAAC,EAAE;SAChD,UAAU,CAAC,QAAQ,CAAC;SACpB,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IAEZ,uDAAuD;IACvD,2BAA2B;IAC3B,gBAAgB;IAChB,eAAe;IAEf,MAAM,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/C,oDAAoD;AACrD,CAAC,CACD,CAAC;AAEF,IAAI,CAAC,yGAAyG,EAAE,KAAK,IAAI,EAAE;IAC1H,MAAM,wBAAwB,GAAe;QAC5C,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;KAClD,CAAC;IACF,MAAM,sBAAsB,GAAgB;QAC3C;YACC,EAAE,EAAE,GAAG;YACP,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,wBAAwB,CAAC,CAAC,CAAE,CAAC,EAAE;YAC5C,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,aAAa;SACzB;KACD,CAAC;IAEF,MAAM,UAAU,GAAc;QAC7B,GAAG,EAAE,aAAa;QAClB,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAC9C,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,QAAQ,EAAE,IAAI,UAAU,EAAE,EAAE,CAAC;KACvE,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;QACvC,IAAI,EAAE,MAAM,UAAU,EAAE;QACxB,cAAc,EAAE,CAAC,UAAU,CAAC;KAC5B,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;QACvC,IAAI,EAAE,MAAM,UAAU,EAAE;QACxB,cAAc,EAAE,CAAC,UAAU,CAAC;KAC5B,CAAC,CAAC;IAEH,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,MAAM,CAAC;SAClB,MAAM,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,UAAU,EAAE,EAAE,CAAC;SAClE,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,UAAU,CAAC;SACtB,MAAM,CACN,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAClC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC,CAAC,CACF;SACA,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,sBAAsB,CAAC;SAC9B,OAAO,EAAE,CAAC;IAEZ,MAAM,KAAK,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,EAAE;SAChC,UAAU,CAAC,QAAQ,CAAC;SACpB,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,MAAM,CAAC;SAChC,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IAEZ,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;IAC9E,MAAM,UAAU,GAAc;QAC7B,GAAG,EAAE,aAAa;QAClB,iBAAiB,EAAE,GAAG;QACtB,aAAa,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;YAClC,OAAO;gBACN;oBACC,MAAM,EAAE;wBACP,GAAG,EAAE,MAAM;wBACX,IAAI,EAAE,MAAM;qBACZ;oBACD,SAAS,EAAE,MAAM;oBACjB,QAAQ,EAAE,KAAK;wBACd,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE;wBACjD,CAAC,CAAC,SAAS;iBACZ;aACD,CAAC;QACH,CAAC;QACD,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,UAAU,EAAE,EAAE,CAAC;KAC1D,CAAC;IAEF,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC;QAClC,IAAI,EAAE,MAAM,UAAU,EAAE;QACxB,cAAc,EAAE,CAAC,UAAU,CAAC;KAC5B,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,IAAI,WAAW,EAAE,CAAC;IAE9B,MAAM,IAAI,CAAC,EAAE;SACX,UAAU,CAAC,MAAM,CAAC;SAClB,MAAM,CAAC;QACP,EAAE,EAAE,MAAM;QACV,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC;KACjC,CAAC;SACD,OAAO,EAAE,CAAC;IAEZ,MAAM,kBAAkB,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;IAExC,6CAA6C;IAC7C,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC;QAClC,IAAI,EAAE,MAAM,IAAI,CAAC,MAAM,EAAE;QACzB,cAAc,EAAE,CAAC,UAAU,CAAC;KAC5B,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE;SAC3B,UAAU,CAAC,QAAQ,CAAC;SACpB,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,oBAAoB,CAAC;SAC1D,SAAS,CAAC,QAAQ,CAAC;SACnB,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,MAAM,CAAC;SAChC,MAAM,CAAC,kBAAkB,CAAC;SAC1B,OAAO,EAAE,CAAC;IAEZ,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CACtB,MAAM,CAAC,eAAe,CAAC;QACtB,MAAM,CAAC,gBAAgB,CAAC;YACvB,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAClB,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU;YAClC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,WAAW;YACpC,UAAU,EAAE,MAAM;YAClB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,MAAM;YACjB,UAAU,EAAE,aAAa;YACzB,OAAO,EAAE;gBACR,IAAI,EAAE,eAAe;aACrB;SACD,CAAC;KACF,CAAC,CACF,CAAC;IAEF,kGAAkG;IAClG,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,EAAE;SACrC,UAAU,CAAC,gBAAgB,CAAC;SAC5B,SAAS,EAAE;SACX,uBAAuB,EAAE,CAAC;IAE5B,MAAM,gBAAgB,CAAC;QACtB,GAAG,EAAE,IAAI;QACT,SAAS,EAAE,MAAM,eAAe,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC;QACvE,OAAO,EAAE,qBAAqB;QAC9B,SAAS,EAAE,EAAE,EAAE,EAAE,iBAAiB,CAAC,EAAE,EAAE;KACvC,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAElD,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,EAAE;SAC1C,UAAU,CAAC,SAAS,CAAC;SACrB,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IACZ,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,EAAE;SAChC,UAAU,CAAC,SAAS,CAAC;SACrB,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IAEZ,uEAAuE;IACvE,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAErD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,EAAE;SACrC,UAAU,CAAC,gBAAgB,CAAC;SAC5B,SAAS,EAAE;SACX,uBAAuB,EAAE,CAAC;IAC5B,MAAM,aAAa,CAAC;QACnB,GAAG,EAAE,IAAI;QACT,aAAa,EAAE,sBAAsB,CAAC,CAAC,CAAE;QACzC,OAAO,EAAE,gBAAgB;QACzB,SAAS,EAAE,EAAE,EAAE,EAAE,iBAAiB,CAAC,EAAE,EAAE;KACvC,CAAC,CAAC;IACH,MAAM,aAAa,CAAC;QACnB,GAAG,EAAE,IAAI;QACT,aAAa,EAAE,sBAAsB,CAAC,CAAC,CAAE;QACzC,OAAO,EAAE,gBAAgB;QACzB,SAAS,EAAE,EAAE,EAAE,EAAE,iBAAiB,CAAC,EAAE,EAAE;KACvC,CAAC,CAAC;IAEH,MAAM,yBAAyB,GAAG,MAAM,IAAI,CAAC,EAAE;SAC7C,UAAU,CAAC,SAAS,CAAC;SACrB,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IAEZ,MAAM,KAAK,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAElD,MAAM,4BAA4B,GAAG,MAAM,IAAI,CAAC,EAAE;SAChD,UAAU,CAAC,SAAS,CAAC;SACrB,SAAS,EAAE;SACX,OAAO,EAAE,CAAC;IAEZ,0FAA0F;IAC1F,MAAM,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC,IAAI,CAC/C,yBAAyB,CAAC,MAAM,GAAG,CAAC,CACpC,CAAC;IAEF,MAAM,KAAK,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAElD,oDAAoD;AACrD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,IAAI,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;IACxE,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC,CAAC;IAE5C,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,EAAE;SACpC,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC;QACP;YACC,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,QAAQ;YACnB,OAAO,EAAE,MAAM;YACf,UAAU,EAAE,aAAa;YACzB,WAAW,EAAE,YAAY;SACzB;QACD;YACC,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,QAAQ;YACnB,OAAO,EAAE,MAAM;YACf,UAAU,EAAE,aAAa;YACzB,WAAW,EAAE,YAAY;SACzB;KACD,CAAC;SACD,YAAY,EAAE;SACd,OAAO,EAAE,CAAC;IAEZ,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC;QACxC,GAAG,EAAE,SAAS;QACd,OAAO,EAAE,CAAC,WAAW,CAAC,CAAC,CAAE,CAAC;KAC1B,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC;QACvC,IAAI,EAAE,MAAM,SAAS,CAAC,MAAM,EAAE;KAC9B,CAAC,CAAC;IAEH,kDAAkD;IAClD,iCAAiC;IACjC,MAAM,SAAS,CAAC,EAAE;SAChB,UAAU,CAAC,oBAAoB,CAAC;SAChC,MAAM,CAAC;QACP,aAAa,EAAE,UAAU,CAAC,EAAE;QAC5B,SAAS,EAAE,WAAW,CAAC,CAAC,CAAE,CAAC,EAAE;KAC7B,CAAC;SACD,OAAO,EAAE,CAAC;IAEZ,uCAAuC;IACvC,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC;QACxC,GAAG,EAAE,SAAS;QACd,OAAO,EAAE,CAAC,WAAW,CAAC,CAAC,CAAE,CAAC;KAC1B,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IAEtC,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,EAAE;SACnC,UAAU,CAAC,YAAY,CAAC;SACxB,SAAS,EAAE;QACZ,uCAAuC;SACtC,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,sCAAsC,CAAC;SAC7D,OAAO,EAAE,CAAC;IAEZ,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,EAAE;SACxC,UAAU,CAAC,oBAAoB,CAAC;SAChC,SAAS,EAAE;SACX,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,CAAC;SAC1C,OAAO,EAAE,CAAC;IACZ,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,EAAE;SACxC,UAAU,CAAC,oBAAoB,CAAC;SAChC,SAAS,EAAE;SACX,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,CAAC;SAC1C,OAAO,EAAE,CAAC;IAEZ,qEAAqE;IACrE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAElC,0DAA0D;IAC1D,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAC5D,MAAM,CAAC,eAAe,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAChE,CAAC;IAEF,iEAAiE;IACjE,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAC5D,MAAM,CAAC,eAAe,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAC5C,CAAC;AACH,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"merge.test.js","sourceRoot":"","sources":["../../src/lix/merge.test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"new-lix.d.ts","sourceRoot":"","sources":["../../src/lix/new-lix.ts"],"names":[],"mappings":"AAMA;;;;;GAKG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAiBhD"}
1
+ {"version":3,"file":"new-lix.d.ts","sourceRoot":"","sources":["../../src/lix/new-lix.ts"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAehD"}