@carlonicora/nestjs-neo4jsonapi 8.15.1 → 8.16.0

package/dist/foundations/offline-change-set/merge/merge-blocks.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeBlocks = mergeBlocks;
+const deep_equal_1 = require("./deep-equal");
+/**
+ * Block-by-block three-way merge of one rich-text field (BlockNote document).
+ *
+ * Blocks are compared by id as objects, never turned into text. Starting from the
+ * server's blocks (theirs):
+ * - a block changed only on the device takes the device's version;
+ * - a block removed on one side and untouched on the other is removed;
+ * - a block added on the device lands after the block that precedes it on the device;
+ * - a block changed on both sides (differently), or removed on one side and changed on
+ *   the other, is a conflict: the merged document keeps the server's version and its
+ *   id is listed in `conflictBlockIds`;
+ * - order: when only one side moved blocks, the merged document follows that side's order
+ *   (the blocks' content still merges as above); when both sides moved blocks into different
+ *   orders, `orderConflict` is true and the server's order is kept.
+ *
+ * With `prefer: "mine"` (the GM chose this device's version of the field) every conflict
+ * resolves to the device's side instead (its block, its removal, its order) and nothing is
+ * reported; `prefer: "theirs"` resolves them to the server's side.
+ */
+function mergeBlocks(p) {
+    const base = new Map(p.base.map((b) => [b.id, b]));
+    const mine = new Map(p.mine.map((b) => [b.id, b]));
+    const theirs = new Map(p.theirs.map((b) => [b.id, b]));
+    const preferMine = p.prefer === "mine";
+    const report = p.prefer === undefined;
+    const merged = [...p.theirs];
+    const conflictBlockIds = [];
+    /** Device blocks missing from `merged` that the device's version brings back. */
+    const restore = new Set();
+    const indexOf = (id) => merged.findIndex((b) => b.id === id);
+    const conflict = (id, takeMine) => {
+        if (preferMine)
+            takeMine();
+        else if (report)
+            conflictBlockIds.push(id);
+    };
+    for (const [id, baseBlock] of base) {
+        const mineBlock = mine.get(id);
+        const theirsBlock = theirs.get(id);
+        const mineChanged = mineBlock !== undefined && !(0, deep_equal_1.jsonEqual)(mineBlock, baseBlock);
+        const theirsChanged = theirsBlock !== undefined && !(0, deep_equal_1.jsonEqual)(theirsBlock, baseBlock);
+        const mineRemoved = mineBlock === undefined;
+        const theirsRemoved = theirsBlock === undefined;
+        if (mineRemoved) {
+            if (theirsRemoved)
+                continue;
+            if (theirsChanged)
+                conflict(id, () => merged.splice(indexOf(id), 1));
+            else
+                merged.splice(indexOf(id), 1);
+            continue;
+        }
+        if (!mineChanged)
+            continue;
+        if (theirsRemoved) {
+            conflict(id, () => restore.add(id));
+            continue;
+        }
+        if (theirsChanged) {
+            if (!(0, deep_equal_1.jsonEqual)(mineBlock, theirsBlock))
+                conflict(id, () => (merged[indexOf(id)] = mineBlock));
+            continue;
+        }
+        merged[indexOf(id)] = mineBlock;
+    }
+    // Order of the blocks every side still holds.
+    const common = (list) => list.map((b) => b.id).filter((id) => base.has(id) && mine.has(id) && theirs.has(id));
+    const baseOrder = common(p.base);
+    const mineOrder = common(p.mine);
+    const theirsOrder = common(p.theirs);
+    const mineMoved = !(0, deep_equal_1.jsonEqual)(mineOrder, baseOrder);
+    const theirsMoved = !(0, deep_equal_1.jsonEqual)(theirsOrder, baseOrder);
+    const bothMovedDifferently = mineMoved && theirsMoved && !(0, deep_equal_1.jsonEqual)(mineOrder, theirsOrder);
+    const orderConflict = report && bothMovedDifferently;
+    if ((mineMoved && !theirsMoved) || (bothMovedDifferently && preferMine)) {
+        // The slots those blocks hold in `merged` take the device's order; every other block stays put.
+        const commonSet = new Set(mineOrder);
+        const byId = new Map(merged.map((b) => [b.id, b]));
+        let next = 0;
+        for (let index = 0; index < merged.length; index++)
+            if (commonSet.has(merged[index].id))
+                merged[index] = byId.get(mineOrder[next++]);
+    }
+    // Blocks the device added (or brings back): each lands after the block that precedes it on the device.
+    let previousId;
+    for (const mineBlock of p.mine) {
+        const id = mineBlock.id;
+        if (!base.has(id) || restore.has(id)) {
+            const at = indexOf(id);
+            if (at !== -1) {
+                if (!(0, deep_equal_1.jsonEqual)(merged[at], mineBlock))
+                    conflict(id, () => (merged[at] = mineBlock));
+            }
+            else {
+                const insertAt = previousId === undefined ? 0 : indexOf(previousId) + 1;
+                merged.splice(insertAt, 0, mineBlock);
+            }
+        }
+        if (indexOf(id) !== -1)
+            previousId = id;
+    }
+    return { merged, conflictBlockIds, orderConflict };
+}
+//# sourceMappingURL=merge-blocks.js.map

package/dist/foundations/offline-change-set/merge/merge-blocks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-blocks.js","sourceRoot":"","sources":["../../../../src/foundations/offline-change-set/merge/merge-blocks.ts"],"names":[],"mappings":"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"}

package/dist/foundations/offline-change-set/merge/three-way-merge.d.ts

@@ -0,0 +1,57 @@
+/** A JSON:API resource object as the wire carries it (only attributes and relationships are read). */
+export type Resource = {
+    type?: string;
+    id?: string;
+    attributes?: Record<string, unknown>;
+    relationships?: Record<string, unknown>;
+    [key: string]: unknown;
+};
+/** Whose value a conflicting field takes once the GM has chosen. */
+export type FieldChoice = "mine" | "theirs" | "merged";
+/** The GM's answer to an earlier conflict on this record. */
+export type MergeResolution = {
+    /** Per conflicting field (attribute or relationship name). */
+    choices?: Record<string, FieldChoice>;
+    /** The choice of every conflicting field `choices` does not name ("Keep mine" = "mine"). */
+    all?: FieldChoice;
+    /** The resource holding the hand-merged values of the fields chosen "merged". */
+    merged?: Resource;
+};
+export type ThreeWayMergeResult = {
+    /** Every attribute of the server's record, with what the merge settled in place. */
+    attributes: Record<string, unknown>;
+    /** Every relationship the device sent, with the merged linkage (and edge props in `meta`). */
+    relationships: Record<string, unknown>;
+    /** Attribute and relationship names the save must write (never one only the server changed). */
+    changed: string[];
+    /** Attribute and relationship names both sides changed differently (and no choice settles). */
+    conflictFields: string[];
+    /** Rich-text field → conflicting block ids. */
+    conflictBlocks: Record<string, string[]>;
+};
+/**
+ * Three-way merge of one record: base (the record at the last sync), mine (the document the
+ * device's model built) and theirs (the record on the server now). Only fields the device
+ * sent are considered; a field only the server changed is kept and never written.
+ *
+ * - Only one side changed a field → that side.
+ * - Both changed a plain field to different values → conflict.
+ * - Both changed a rich-text field → block-by-block merge (`mergeBlocks`, block order included).
+ * - Relationships never conflict: ids added or removed on only one side are applied; edge
+ *   props (`meta`) changed on only one side are applied; when both sides changed the same
+ *   link's props, the device's win (the GM's later edit).
+ * - A relationship missing from theirs (or base) is empty when it is one of
+ *   `knownRelationships` (the server always answers those, and omits an empty one);
+ *   otherwise it is unknown and treated as unchanged.
+ * - `resolution` settles conflicts with the GM's choices: "mine" → the device's value,
+ *   "theirs" → the server's (not written), "merged" → the value in `resolution.merged`.
+ */
+export declare function threeWayMerge(p: {
+    base: Resource;
+    mine: Resource;
+    theirs: Resource;
+    richTextFields: string[];
+    knownRelationships?: string[];
+    resolution?: MergeResolution;
+}): ThreeWayMergeResult;
+//# sourceMappingURL=three-way-merge.d.ts.map

package/dist/foundations/offline-change-set/merge/three-way-merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"three-way-merge.d.ts","sourceRoot":"","sources":["../../../../src/foundations/offline-change-set/merge/three-way-merge.ts"],"names":[],"mappings":"AAGA,sGAAsG;AACtG,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AASF,oEAAoE;AACpE,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEvD,6DAA6D;AAC7D,MAAM,MAAM,eAAe,GAAG;IAC5B,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACtC,4FAA4F;IAC5F,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,iFAAiF;IACjF,MAAM,CAAC,EAAE,QAAQ,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,oFAAoF;IACpF,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,8FAA8F;IAC9F,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,gGAAgG;IAChG,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,+FAA+F;IAC/F,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,+CAA+C;IAC/C,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC1C,CAAC;AAwCF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,QAAQ,CAAC;IACjB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B,GAAG,mBAAmB,CA6ItB"}

package/dist/foundations/offline-change-set/merge/three-way-merge.js

@@ -0,0 +1,201 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.threeWayMerge = threeWayMerge;
+const deep_equal_1 = require("./deep-equal");
+const merge_blocks_1 = require("./merge-blocks");
+/** Rich text travels as the JSON string the model wrote. `undefined` when it is not a block array. */
+function parseBlocks(value) {
+    if (value === undefined || value === null || value === "")
+        return [];
+    if (Array.isArray(value))
+        return value;
+    if (typeof value !== "string")
+        return undefined;
+    try {
+        const parsed = JSON.parse(value);
+        return Array.isArray(parsed) ? parsed : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function linkage(rel) {
+    if (!rel || typeof rel !== "object" || !("data" in rel))
+        return undefined;
+    return rel.data ?? null;
+}
+const idsOf = (data) => data == null ? [] : Array.isArray(data) ? data.map((d) => d.id) : [data.id];
+const isObject = (value) => !!value && typeof value === "object" && !Array.isArray(value);
+/**
+ * The edge props a side holds for one linked id: the identifier's `meta`, or (to-one) the
+ * relationship's `meta`. `undefined` when that side says nothing about them.
+ */
+function propsOf(rel, id) {
+    const data = linkage(rel);
+    if (data == null)
+        return undefined;
+    const item = (Array.isArray(data) ? data : [data]).find((d) => d.id === id);
+    if (!item)
+        return undefined;
+    if (isObject(item.meta))
+        return item.meta;
+    if (!Array.isArray(data) && isObject(rel.meta))
+        return rel.meta;
+    return undefined;
+}
+/**
+ * Three-way merge of one record: base (the record at the last sync), mine (the document the
+ * device's model built) and theirs (the record on the server now). Only fields the device
+ * sent are considered; a field only the server changed is kept and never written.
+ *
+ * - Only one side changed a field → that side.
+ * - Both changed a plain field to different values → conflict.
+ * - Both changed a rich-text field → block-by-block merge (`mergeBlocks`, block order included).
+ * - Relationships never conflict: ids added or removed on only one side are applied; edge
+ *   props (`meta`) changed on only one side are applied; when both sides changed the same
+ *   link's props, the device's win (the GM's later edit).
+ * - A relationship missing from theirs (or base) is empty when it is one of
+ *   `knownRelationships` (the server always answers those, and omits an empty one);
+ *   otherwise it is unknown and treated as unchanged.
+ * - `resolution` settles conflicts with the GM's choices: "mine" → the device's value,
+ *   "theirs" → the server's (not written), "merged" → the value in `resolution.merged`.
+ */
+function threeWayMerge(p) {
+    const base = p.base?.attributes ?? {};
+    const mine = p.mine?.attributes ?? {};
+    const theirs = p.theirs?.attributes ?? {};
+    const choiceOf = (name) => p.resolution ? (p.resolution.choices?.[name] ?? p.resolution.all) : undefined;
+    const mergedAttributes = p.resolution?.merged?.attributes ?? {};
+    const attributes = { ...theirs };
+    const changed = [];
+    const conflictFields = [];
+    const conflictBlocks = {};
+    /** Writes `value` when it differs from the server's. */
+    const settle = (field, value, differs) => {
+        attributes[field] = value;
+        if (differs)
+            changed.push(field);
+    };
+    for (const field of Object.keys(mine)) {
+        const b = base[field];
+        const m = mine[field];
+        const t = theirs[field];
+        const isRichText = p.richTextFields.includes(field);
+        const blocks = isRichText ? { b: parseBlocks(b), m: parseBlocks(m), t: parseBlocks(t) } : undefined;
+        const asBlocks = blocks && blocks.b && blocks.m && blocks.t ? blocks : undefined;
+        const same = (x, y, bx, by) => asBlocks ? (0, deep_equal_1.jsonEqual)(bx, by) : (0, deep_equal_1.jsonEqual)(x, y);
+        if (same(m, b, asBlocks?.m, asBlocks?.b))
+            continue;
+        if (same(t, b, asBlocks?.t, asBlocks?.b)) {
+            settle(field, m, true);
+            continue;
+        }
+        if (same(m, t, asBlocks?.m, asBlocks?.t))
+            continue;
+        const choice = choiceOf(field);
+        if (asBlocks) {
+            const result = (0, merge_blocks_1.mergeBlocks)({ base: asBlocks.b, mine: asBlocks.m, theirs: asBlocks.t });
+            const conflicting = result.conflictBlockIds.length > 0 || result.orderConflict;
+            if (!conflicting) {
+                settle(field, JSON.stringify(result.merged), !(0, deep_equal_1.jsonEqual)(result.merged, asBlocks.t));
+                continue;
+            }
+            if (choice === "mine" || choice === "theirs") {
+                const chosen = (0, merge_blocks_1.mergeBlocks)({ base: asBlocks.b, mine: asBlocks.m, theirs: asBlocks.t, prefer: choice });
+                settle(field, JSON.stringify(chosen.merged), !(0, deep_equal_1.jsonEqual)(chosen.merged, asBlocks.t));
+                continue;
+            }
+            if (choice === "merged" && field in mergedAttributes) {
+                const value = mergedAttributes[field];
+                settle(field, value, !(0, deep_equal_1.jsonEqual)(parseBlocks(value) ?? value, asBlocks.t));
+                continue;
+            }
+            attributes[field] = JSON.stringify(result.merged);
+            conflictFields.push(field);
+            // A conflicting order is a whole-field choice: no block list for it.
+            if (!result.orderConflict)
+                conflictBlocks[field] = result.conflictBlockIds;
+            continue;
+        }
+        if (choice === "mine")
+            settle(field, m, true);
+        else if (choice === "theirs")
+            continue;
+        else if (choice === "merged" && field in mergedAttributes)
+            settle(field, mergedAttributes[field], !(0, deep_equal_1.jsonEqual)(mergedAttributes[field], t));
+        else
+            conflictFields.push(field);
+    }
+    const relationships = {};
+    const baseRels = p.base?.relationships ?? {};
+    const theirsRels = p.theirs?.relationships ?? {};
+    const known = new Set(p.knownRelationships ?? []);
+    for (const [name, mineRel] of Object.entries(p.mine?.relationships ?? {})) {
+        const mineData = linkage(mineRel);
+        if (mineData === undefined)
+            continue;
+        const empty = Array.isArray(mineData) ? [] : null;
+        const theirsRel = theirsRels[name] ?? (known.has(name) ? { data: empty } : undefined);
+        const baseRel = baseRels[name] ?? (known.has(name) ? { data: empty } : undefined);
+        const theirsData = linkage(theirsRel);
+        const theirsKnown = theirsData !== undefined;
+        const baseData = linkage(baseRel);
+        const baseIds = baseData === undefined ? (theirsKnown ? idsOf(theirsData) : []) : idsOf(baseData);
+        const theirsIds = theirsKnown ? idsOf(theirsData) : baseIds;
+        const identifiers = new Map();
+        for (const d of [theirsData, mineData]) {
+            if (d == null)
+                continue;
+            for (const item of Array.isArray(d) ? d : [d])
+                identifiers.set(item.id, item);
+        }
+        let resultIds;
+        if (Array.isArray(mineData)) {
+            const mineIds = mineData.map((d) => d.id);
+            const added = mineIds.filter((id) => !baseIds.includes(id));
+            const removed = baseIds.filter((id) => !mineIds.includes(id));
+            resultIds = [...theirsIds.filter((id) => !removed.includes(id))];
+            for (const id of added)
+                if (!resultIds.includes(id))
+                    resultIds.push(id);
+        }
+        else {
+            const mineId = mineData?.id ?? null;
+            const baseId = baseIds[0] ?? null;
+            const theirsId = theirsIds[0] ?? null;
+            const resultId = mineId === baseId ? theirsId : mineId;
+            resultIds = resultId === null ? [] : [resultId];
+        }
+        // Edge props of every link the result keeps.
+        let linkChanged = !(0, deep_equal_1.jsonEqual)([...resultIds].sort(), [...theirsIds].sort());
+        const finalProps = new Map();
+        for (const id of resultIds) {
+            const bp = baseIds.includes(id) ? propsOf(baseRel, id) : undefined;
+            const mp = propsOf(mineRel, id);
+            const tp = theirsIds.includes(id) ? propsOf(theirsRel, id) : undefined;
+            const mineChanged = mp !== undefined && !(0, deep_equal_1.jsonEqual)(mp, bp);
+            // The device's props when it changed them (also when the server changed them too), else the server's.
+            const props = mineChanged ? mp : (tp ?? mp);
+            finalProps.set(id, props);
+            if (theirsIds.includes(id) && props !== undefined && !(0, deep_equal_1.jsonEqual)(props, tp))
+                linkChanged = true;
+        }
+        const identifierOf = (id) => {
+            const { meta: _meta, ...identifier } = identifiers.get(id) ?? { id };
+            const props = finalProps.get(id);
+            return props === undefined ? identifier : { ...identifier, id, meta: props };
+        };
+        if (Array.isArray(mineData)) {
+            relationships[name] = { ...mineRel, data: resultIds.map(identifierOf) };
+        }
+        else {
+            const { meta: _relMeta, ...rest } = mineRel;
+            const data = resultIds.length === 0 ? null : identifierOf(resultIds[0]);
+            relationships[name] = data?.meta ? { ...rest, data, meta: data.meta } : { ...rest, data };
+        }
+        if (linkChanged)
+            changed.push(name);
+    }
+    return { attributes, relationships, changed, conflictFields, conflictBlocks };
+}
+//# sourceMappingURL=three-way-merge.js.map

package/dist/foundations/offline-change-set/merge/three-way-merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"three-way-merge.js","sourceRoot":"","sources":["../../../../src/foundations/offline-change-set/merge/three-way-merge.ts"],"names":[],"mappings":"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"}

package/dist/foundations/offline-change-set/offline-change-set.module.d.ts

@@ -0,0 +1,11 @@
+import { OnModuleInit } from "@nestjs/common";
+/**
+ * Offline change sets: opens a package of every change a device queued while offline and runs
+ * each one through the app's own routes. Loaded by `OfflineModule` when
+ * `bootstrap({ offline: { changeSets: true } })`. Declares no controller: the receiving route
+ * (`POST /offline-change-sets`) belongs to the app, which calls `OfflineChangeSetService.apply`.
+ */
+export declare class OfflineChangeSetModule implements OnModuleInit {
+    onModuleInit(): void;
+}
+//# sourceMappingURL=offline-change-set.module.d.ts.map

package/dist/foundations/offline-change-set/offline-change-set.module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"offline-change-set.module.d.ts","sourceRoot":"","sources":["../../../src/foundations/offline-change-set/offline-change-set.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQtD;;;;;GAKG;AACH,qBAUa,sBAAuB,YAAW,YAAY;IACzD,YAAY;CAGb"}

package/dist/foundations/offline-change-set/offline-change-set.module.js

@@ -0,0 +1,41 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OfflineChangeSetModule = void 0;
+const common_1 = require("@nestjs/common");
+const core_1 = require("@nestjs/core");
+const registry_1 = require("../../common/registries/registry");
+const offline_change_set_1 = require("./entities/offline-change-set");
+const offline_change_set_repository_1 = require("./repositories/offline-change-set.repository");
+const offline_change_set_service_1 = require("./services/offline-change-set.service");
+const offline_route_runner_service_1 = require("./services/offline-route-runner.service");
+/**
+ * Offline change sets: opens a package of every change a device queued while offline and runs
+ * each one through the app's own routes. Loaded by `OfflineModule` when
+ * `bootstrap({ offline: { changeSets: true } })`. Declares no controller: the receiving route
+ * (`POST /offline-change-sets`) belongs to the app, which calls `OfflineChangeSetService.apply`.
+ */
+let OfflineChangeSetModule = class OfflineChangeSetModule {
+    onModuleInit() {
+        registry_1.modelRegistry.register(offline_change_set_1.OfflineChangeSetDescriptor.model);
+    }
+};
+exports.OfflineChangeSetModule = OfflineChangeSetModule;
+exports.OfflineChangeSetModule = OfflineChangeSetModule = __decorate([
+    (0, common_1.Module)({
+        imports: [core_1.DiscoveryModule],
+        providers: [
+            offline_change_set_1.OfflineChangeSetDescriptor.model.serialiser,
+            offline_change_set_repository_1.OfflineChangeSetRepository,
+            offline_change_set_service_1.OfflineChangeSetService,
+            offline_route_runner_service_1.OfflineRouteRunner,
+        ],
+        exports: [offline_change_set_service_1.OfflineChangeSetService],
+    })
+], OfflineChangeSetModule);
+//# sourceMappingURL=offline-change-set.module.js.map

package/dist/foundations/offline-change-set/offline-change-set.module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"offline-change-set.module.js","sourceRoot":"","sources":["../../../src/foundations/offline-change-set/offline-change-set.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAsD;AACtD,uCAA+C;AAC/C,+DAAiE;AACjE,sEAA2E;AAC3E,gGAA0F;AAC1F,sFAAgF;AAChF,0FAA6E;AAE7E;;;;;GAKG;AAWI,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YAAY;QACV,wBAAa,CAAC,QAAQ,CAAC,+CAA0B,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC;CACF,CAAA;AAJY,wDAAsB;iCAAtB,sBAAsB;IAVlC,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,sBAAe,CAAC;QAC1B,SAAS,EAAE;YACT,+CAA0B,CAAC,KAAK,CAAC,UAAU;YAC3C,0DAA0B;YAC1B,oDAAuB;YACvB,iDAAkB;SACnB;QACD,OAAO,EAAE,CAAC,oDAAuB,CAAC;KACnC,CAAC;GACW,sBAAsB,CAIlC"}

package/dist/foundations/offline-change-set/repositories/offline-change-set.repository.d.ts

@@ -0,0 +1,26 @@
+import { ClsService } from "nestjs-cls";
+import { AbstractRepository } from "../../../core/neo4j/abstracts/abstract.repository";
+import { Neo4jService } from "../../../core/neo4j/services/neo4j.service";
+import { SecurityService } from "../../../core/security/services/security.service";
+import { OfflineChangeSet, OfflineChangeSetDescriptor } from "../entities/offline-change-set";
+/**
+ * Repository of the stored offline change sets (one `OfflineChangeSet` node of the caller's
+ * company per package opened, holding its results). The service uses the inherited,
+ * company-scoped `findById` (a package sent again) and `create` (a package just opened), and
+ * `deleteOlderThan` (clean-up of old ones); every read and write of a change itself runs
+ * through the app's own routes (`OfflineRouteRunner`).
+ * The inherited `onModuleInit` creates the id constraint.
+ */
+export declare class OfflineChangeSetRepository extends AbstractRepository<OfflineChangeSet, typeof OfflineChangeSetDescriptor.relationships> {
+    protected readonly descriptor: import("../../..").EntityDescriptor<OfflineChangeSet, {}>;
+    constructor(neo4j: Neo4jService, securityService: SecurityService, clsService: ClsService);
+    /**
+     * Deletes the request company's stored change sets created before `before`. Without a company
+     * in the request it deletes nothing: `buildDefaultMatch()` matches every company's nodes when
+     * `$companyId` is null.
+     */
+    deleteOlderThan(params: {
+        before: Date;
+    }): Promise<void>;
+}
+//# sourceMappingURL=offline-change-set.repository.d.ts.map

package/dist/foundations/offline-change-set/repositories/offline-change-set.repository.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"offline-change-set.repository.d.ts","sourceRoot":"","sources":["../../../../src/foundations/offline-change-set/repositories/offline-change-set.repository.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AACvF,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAE9F;;;;;;;GAOG;AACH,qBACa,0BAA2B,SAAQ,kBAAkB,CAChE,gBAAgB,EAChB,OAAO,0BAA0B,CAAC,aAAa,CAChD;IACC,SAAS,CAAC,QAAQ,CAAC,UAAU,4DAA8B;gBAE/C,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAE,UAAU;IAIzF;;;;OAIG;IACG,eAAe,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAe/D"}

package/dist/foundations/offline-change-set/repositories/offline-change-set.repository.js

@@ -0,0 +1,56 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OfflineChangeSetRepository = void 0;
+const common_1 = require("@nestjs/common");
+const nestjs_cls_1 = require("nestjs-cls");
+const abstract_repository_1 = require("../../../core/neo4j/abstracts/abstract.repository");
+const neo4j_service_1 = require("../../../core/neo4j/services/neo4j.service");
+const security_service_1 = require("../../../core/security/services/security.service");
+const offline_change_set_1 = require("../entities/offline-change-set");
+/**
+ * Repository of the stored offline change sets (one `OfflineChangeSet` node of the caller's
+ * company per package opened, holding its results). The service uses the inherited,
+ * company-scoped `findById` (a package sent again) and `create` (a package just opened), and
+ * `deleteOlderThan` (clean-up of old ones); every read and write of a change itself runs
+ * through the app's own routes (`OfflineRouteRunner`).
+ * The inherited `onModuleInit` creates the id constraint.
+ */
+let OfflineChangeSetRepository = class OfflineChangeSetRepository extends abstract_repository_1.AbstractRepository {
+    constructor(neo4j, securityService, clsService) {
+        super(neo4j, securityService, clsService);
+        this.descriptor = offline_change_set_1.OfflineChangeSetDescriptor;
+    }
+    /**
+     * Deletes the request company's stored change sets created before `before`. Without a company
+     * in the request it deletes nothing: `buildDefaultMatch()` matches every company's nodes when
+     * `$companyId` is null.
+     */
+    async deleteOlderThan(params) {
+        const { nodeName } = this.descriptor.model;
+        const query = this.neo4j.initQuery({ serialiser: this.descriptor.model });
+        if (!query.queryParams.companyId)
+            return;
+        query.queryParams = { ...query.queryParams, before: params.before.toISOString() };
+        query.query += `
+      ${this.buildDefaultMatch()}
+      WHERE ${nodeName}.createdAt < datetime($before)
+      DETACH DELETE ${nodeName}
+    `;
+        await this.neo4j.writeOne(query);
+    }
+};
+exports.OfflineChangeSetRepository = OfflineChangeSetRepository;
+exports.OfflineChangeSetRepository = OfflineChangeSetRepository = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [neo4j_service_1.Neo4jService, security_service_1.SecurityService, nestjs_cls_1.ClsService])
+], OfflineChangeSetRepository);
+//# sourceMappingURL=offline-change-set.repository.js.map

package/dist/foundations/offline-change-set/repositories/offline-change-set.repository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"offline-change-set.repository.js","sourceRoot":"","sources":["../../../../src/foundations/offline-change-set/repositories/offline-change-set.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAAwC;AACxC,2FAAuF;AACvF,8EAA0E;AAC1E,uFAAmF;AACnF,uEAA8F;AAE9F;;;;;;;GAOG;AAEI,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,wCAG/C;IAGC,YAAY,KAAmB,EAAE,eAAgC,EAAE,UAAsB;QACvF,KAAK,CAAC,KAAK,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC;QAHzB,eAAU,GAAG,+CAA0B,CAAC;IAI3D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,eAAe,CAAC,MAAwB;QAC5C,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1E,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,SAAS;YAAE,OAAO;QAEzC,KAAK,CAAC,WAAW,GAAG,EAAE,GAAG,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;QAElF,KAAK,CAAC,KAAK,IAAI;QACX,IAAI,CAAC,iBAAiB,EAAE;cAClB,QAAQ;sBACA,QAAQ;KACzB,CAAC;QAEF,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;CACF,CAAA;AA9BY,gEAA0B;qCAA1B,0BAA0B;IADtC,IAAA,mBAAU,GAAE;qCAOQ,4BAAY,EAAmB,kCAAe,EAAc,uBAAU;GAN9E,0BAA0B,CA8BtC"}

package/dist/foundations/offline-change-set/services/offline-change-set.service.d.ts

@@ -0,0 +1,72 @@
+import type { FastifyRequest } from "fastify";
+import { ClsService } from "nestjs-cls";
+import { JsonApiSingleDocument } from "../../../core/jsonapi/interfaces/jsonapi.document.interface";
+import { JsonApiService } from "../../../core/jsonapi/services/jsonapi.service";
+import { AbstractService, JsonApiDTOData } from "../../../core/neo4j/abstracts/abstract.service";
+import { OfflineChangeSet, OfflineChangeSetDescriptor } from "../entities/offline-change-set";
+import { OfflineChangeSetRepository } from "../repositories/offline-change-set.repository";
+import { OfflineRouteRunner } from "./offline-route-runner.service";
+/**
+ * Opens one offline change set (every change the device queued, in one request) and handles
+ * each change in `seq` order through the app's own routes, as the caller (`OfflineRouteRunner`).
+ *
+ * - POST, and any write that names no record, runs as sent.
+ * - PUT/PATCH of a record: the current record is read (GET on the record's own path,
+ *   `<endpoint>/<id>`) and merged with `base` and the device's document (`threeWayMerge`);
+ *   only the changed fields are written, as a PATCH of the device's document trimmed to them
+ *   (merged rich text in place). A change carrying `resolution` merges the same way, and each
+ *   conflicting field takes the GM's choice.
+ * - DELETE of a record: refused as "changed on the server" when a descriptor field or a
+ *   linked id changed since `base`; with `resolution` (delete anyway) it runs without that check.
+ * - After a conflict or a could-not-apply, later changes to the same record wait (a custom
+ *   write `<endpoint>/<id>/...` counts as a change of that record).
+ * - A package is opened once: its results are stored under its id (company-scoped) and a
+ *   package sent again with the same id is answered with them, without running anything.
+ *
+ * The package is never paged, batched or capped.
+ */
+export declare class OfflineChangeSetService extends AbstractService<OfflineChangeSet, typeof OfflineChangeSetDescriptor.relationships> {
+    private readonly offlineChangeSetRepository;
+    private readonly runner;
+    protected readonly descriptor: import("../../..").EntityDescriptor<OfflineChangeSet, {}>;
+    private readonly logger;
+    constructor(jsonApiService: JsonApiService, offlineChangeSetRepository: OfflineChangeSetRepository, clsService: ClsService, runner: OfflineRouteRunner);
+    apply(params: {
+        data: JsonApiDTOData;
+        request: FastifyRequest;
+    }): Promise<JsonApiSingleDocument>;
+    /**
+     * Removes the company's stored change sets older than `STORED_CHANGE_SET_DAYS`: a device sends a
+     * package again only right after a failed answer, never days later. A failed clean-up is
+     * logged and never stops the package.
+     */
+    private removeExpired;
+    /** The JSON:API type answering on an endpoint (the type is the endpoint unless a descriptor says otherwise). */
+    private typeOfEndpoint;
+    /** The record's own path: `<its type's endpoint>/<id>`. */
+    private recordPath;
+    /** The record a change touches: its record fields, the resource a create posts, or the `<endpoint>/<id>` its path targets. */
+    private recordKey;
+    private applyChange;
+    private runAsSent;
+    private toResult;
+    private readCurrent;
+    /**
+     * Relationship names the record's GET always answers when it has a link (the serialiser
+     * emits every descriptor relationship and omits only an empty one), so an omitted one is empty.
+     */
+    private knownRelationships;
+    private mergeResolution;
+    private applyEdit;
+    private applyDelete;
+    /**
+     * The attributes a change could have touched: the descriptor's fields that go on the wire as
+     * stored (no transform, such as a signed URL; not meta; not excluded), minus createdAt/updatedAt
+     * and the fields only the server writes (`SERVER_WRITTEN_ATTRIBUTES`, `immutable` fields).
+     * `undefined` for an unknown type (every attribute base holds is compared, minus those names).
+     */
+    private comparableAttributes;
+    /** A descriptor field or a linked id of the record differs from `base`. */
+    private changedSince;
+}
+//# sourceMappingURL=offline-change-set.service.d.ts.map

package/dist/foundations/offline-change-set/services/offline-change-set.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"offline-change-set.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/offline-change-set/services/offline-change-set.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,OAAO,EAAE,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AACpG,OAAO,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AACjG,OAAO,EAGL,gBAAgB,EAChB,0BAA0B,EAC3B,MAAM,gCAAgC,CAAC;AAGxC,OAAO,EAAE,0BAA0B,EAAE,MAAM,+CAA+C,CAAC;AAC3F,OAAO,EAAsB,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AA+CxF;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBACa,uBAAwB,SAAQ,eAAe,CAC1D,gBAAgB,EAChB,OAAO,0BAA0B,CAAC,aAAa,CAChD;IAMG,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAE3C,OAAO,CAAC,QAAQ,CAAC,MAAM;IAPzB,SAAS,CAAC,QAAQ,CAAC,UAAU,4DAA8B;IAC3D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4C;gBAGjE,cAAc,EAAE,cAAc,EACb,0BAA0B,EAAE,0BAA0B,EACvE,UAAU,EAAE,UAAU,EACL,MAAM,EAAE,kBAAkB;IAKvC,KAAK,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC;IA2CtG;;;;OAIG;YACW,aAAa;IAS3B,gHAAgH;IAChH,OAAO,CAAC,cAAc;IAItB,2DAA2D;IAC3D,OAAO,CAAC,UAAU;IAMlB,8HAA8H;IAC9H,OAAO,CAAC,SAAS;YAUH,WAAW;YAOX,SAAS;IAKvB,OAAO,CAAC,QAAQ;YASF,WAAW;IAUzB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAK1B,OAAO,CAAC,eAAe;YAWT,SAAS;YAqDT,WAAW;IAgBzB;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAkB5B,2EAA2E;IAC3E,OAAO,CAAC,YAAY;CAgBrB"}