@lix-js/sdk 0.4.6 → 0.5.0-preview.0

package/dist/change-set/create-merge-change-set.d.ts

@@ -0,0 +1,23 @@
+import type { Lix } from "../lix/open-lix.js";
+import type { ChangeSet } from "./schema.js";
+/**
+ * Merges two change sets using a "source wins" strategy (until lix models conflicts).
+ *
+ * Creates a new change set containing the merged result. If an element
+ * (identified by entity_id, file_id, schema_key) exists in both the source
+ * and target change sets (considering their respective histories), the element
+ * from the source change set's history takes precedence.
+ *
+ * @param args - The arguments for the merge operation.
+ * @param args.lix - The Lix instance.
+ * @param args.source - The source change set (only `id` is needed).
+ * @param args.target - The target change set (only `id` is needed).
+ *
+ * @returns A Promise resolving to the newly created ChangeSet representing the merged state.
+ */
+export declare function createMergeChangeSet(args: {
+    lix: Lix;
+    source: Pick<ChangeSet, "id">;
+    target: Pick<ChangeSet, "id">;
+}): Promise<ChangeSet>;
+//# sourceMappingURL=create-merge-change-set.d.ts.map

package/dist/change-set/create-merge-change-set.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-merge-change-set.d.ts","sourceRoot":"","sources":["../../src/change-set/create-merge-change-set.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAI9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAChD,GAAG,EAAE,GAAG,CAAC;IACT,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC9B,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;CAC9B,GAAG,OAAO,CAAC,SAAS,CAAC,CAyErB"}

package/dist/change-set/create-merge-change-set.js

@@ -0,0 +1,68 @@
+import { changeSetElementInAncestryOf } from "../query-filter/change-set-element-in-ancestry-of.js";
+import { changeSetElementIsLeafOf } from "../query-filter/change-set-element-is-leaf-of.js";
+import { createChangeSet } from "./create-change-set.js";
+/**
+ * Merges two change sets using a "source wins" strategy (until lix models conflicts).
+ *
+ * Creates a new change set containing the merged result. If an element
+ * (identified by entity_id, file_id, schema_key) exists in both the source
+ * and target change sets (considering their respective histories), the element
+ * from the source change set's history takes precedence.
+ *
+ * @param args - The arguments for the merge operation.
+ * @param args.lix - The Lix instance.
+ * @param args.source - The source change set (only `id` is needed).
+ * @param args.target - The target change set (only `id` is needed).
+ *
+ * @returns A Promise resolving to the newly created ChangeSet representing the merged state.
+ */
+export async function createMergeChangeSet(args) {
+    const executeInTransaction = async (trx) => {
+        // --- Calculate the merged elements using "source wins" logic ---
+        const mergedElements = await trx
+            .with("SourceLeaves", (db) => db
+            .selectFrom("change_set_element")
+            .where(changeSetElementInAncestryOf([args.source]))
+            .where(changeSetElementIsLeafOf([args.source]))
+            .selectAll("change_set_element"))
+            .with("TargetLeaves", (db) => db
+            .selectFrom("change_set_element")
+            .where(changeSetElementInAncestryOf([args.target]))
+            .where(changeSetElementIsLeafOf([args.target]))
+            .selectAll("change_set_element"))
+            .selectFrom("SourceLeaves") // Select all source leaves (they always win)
+            .selectAll()
+            .union((db) => db
+            .selectFrom("TargetLeaves") // Select target leaves...
+            .selectAll()
+            .where(({ not, exists, selectFrom }) => not(exists(
+        // ...that do NOT have a corresponding entity in SourceLeaves
+        selectFrom("SourceLeaves")
+            .select("SourceLeaves.entity_id") // Select something small
+            .whereRef("SourceLeaves.entity_id", "=", "TargetLeaves.entity_id")
+            .whereRef("SourceLeaves.file_id", "=", "TargetLeaves.file_id")
+            .whereRef("SourceLeaves.schema_key", "=", "TargetLeaves.schema_key")))) // End WHERE NOT EXISTS
+        ) // End UNION
+            .execute();
+        // Create the new merge change set record
+        const newChangeSet = await createChangeSet({
+            lix: { ...args.lix, db: trx },
+            elements: mergedElements.map((ce) => ({
+                change_id: ce.change_id,
+                entity_id: ce.entity_id,
+                schema_key: ce.schema_key,
+                file_id: ce.file_id,
+            })),
+            parents: [args.source, args.target],
+        });
+        return newChangeSet;
+    };
+    // Restore transaction handling
+    if (args.lix.db.isTransaction) {
+        return executeInTransaction(args.lix.db);
+    }
+    else {
+        return args.lix.db.transaction().execute(executeInTransaction);
+    }
+}
+//# sourceMappingURL=create-merge-change-set.js.map

package/dist/change-set/create-merge-change-set.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-merge-change-set.js","sourceRoot":"","sources":["../../src/change-set/create-merge-change-set.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,sDAAsD,CAAC;AACpG,OAAO,EAAE,wBAAwB,EAAE,MAAM,kDAAkD,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,IAI1C;IACA,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAc,EAAE,EAAE;QACrD,kEAAkE;QAClE,MAAM,cAAc,GAAG,MAAM,GAAG;aAC9B,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,EAAE,CAC5B,EAAE;aACA,UAAU,CAAC,oBAAoB,CAAC;aAChC,KAAK,CAAC,4BAA4B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;aAClD,KAAK,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;aAC9C,SAAS,CAAC,oBAAoB,CAAC,CACjC;aACA,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,EAAE,CAC5B,EAAE;aACA,UAAU,CAAC,oBAAoB,CAAC;aAChC,KAAK,CAAC,4BAA4B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;aAClD,KAAK,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;aAC9C,SAAS,CAAC,oBAAoB,CAAC,CACjC;aACA,UAAU,CAAC,cAAc,CAAC,CAAC,6CAA6C;aACxE,SAAS,EAAE;aACX,KAAK,CACL,CAAC,EAAE,EAAE,EAAE,CACN,EAAE;aACA,UAAU,CAAC,cAAc,CAAC,CAAC,0BAA0B;aACrD,SAAS,EAAE;aACX,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,CACtC,GAAG,CACF,MAAM;QACL,6DAA6D;QAC7D,UAAU,CAAC,cAAc,CAAC;aACxB,MAAM,CAAC,wBAAwB,CAAC,CAAC,yBAAyB;aAC1D,QAAQ,CACR,wBAAwB,EACxB,GAAG,EACH,wBAAwB,CACxB;aACA,QAAQ,CACR,sBAAsB,EACtB,GAAG,EACH,sBAAsB,CACtB;aACA,QAAQ,CACR,yBAAyB,EACzB,GAAG,EACH,yBAAyB,CACzB,CACF,CACD,CACD,CAAC,uBAAuB;SAC3B,CAAC,YAAY;aACb,OAAO,EAAE,CAAC;QAEZ,yCAAyC;QACzC,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC;YAC1C,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE;YAC7B,QAAQ,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACrC,SAAS,EAAE,EAAE,CAAC,SAAS;gBACvB,SAAS,EAAE,EAAE,CAAC,SAAS;gBACvB,UAAU,EAAE,EAAE,CAAC,UAAU;gBACzB,OAAO,EAAE,EAAE,CAAC,OAAO;aACnB,CAAC,CAAC;YACH,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;SACnC,CAAC,CAAC;QAEH,OAAO,YAAY,CAAC;IACrB,CAAC,CAAC;IAEF,+BAA+B;IAC/B,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC;QAC/B,OAAO,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1C,CAAC;SAAM,CAAC;QACP,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAChE,CAAC;AACF,CAAC"}

package/dist/change-set/create-merge-change-set.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=create-merge-change-set.test.d.ts.map

package/dist/change-set/create-merge-change-set.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-merge-change-set.test.d.ts","sourceRoot":"","sources":["../../src/change-set/create-merge-change-set.test.ts"],"names":[],"mappings":""}

package/dist/change-set/create-merge-change-set.test.js

@@ -0,0 +1,211 @@
+import { expect, test } from "vitest";
+import { openLix } from "../lix/open-lix.js";
+import { createMergeChangeSet } from "./create-merge-change-set.js";
+import { createChangeSet } from "./create-change-set.js";
+test("it should merge non-conflicting changes", async () => {
+    const lix = await openLix({});
+    await lix.db
+        .insertInto("stored_schema")
+        .values({
+        value: {
+            "x-lix-key": "test_schema",
+            "x-lix-version": "1.0",
+            type: "object",
+            additionalProperties: false,
+            properties: {
+                id: { type: "string" },
+            },
+            required: ["id"],
+        },
+    })
+        .execute();
+    const changes = await lix.db
+        .insertInto("change")
+        .values([
+        {
+            id: "c0",
+            schema_key: "test_schema",
+            schema_version: "1.0",
+            entity_id: "e0",
+            file_id: "file0",
+            plugin_key: "mock_plugin",
+            snapshot_content: null,
+        },
+        {
+            id: "c1",
+            schema_key: "test_schema",
+            schema_version: "1.0",
+            entity_id: "e1",
+            file_id: "file0",
+            plugin_key: "mock_plugin",
+            snapshot_content: null,
+        },
+        {
+            id: "c2",
+            schema_key: "test_schema",
+            schema_version: "1.0",
+            entity_id: "e2",
+            file_id: "file0",
+            plugin_key: "mock_plugin",
+            snapshot_content: null,
+        },
+    ])
+        .returningAll()
+        .execute();
+    const cs0 = await createChangeSet({
+        lix,
+        elements: [changes[0]].map((change) => ({
+            change_id: change.id,
+            entity_id: change.entity_id,
+            schema_key: change.schema_key,
+            file_id: change.file_id,
+        })),
+    });
+    const cs1 = await createChangeSet({
+        lix,
+        elements: [changes[1]].map((change) => ({
+            change_id: change.id,
+            entity_id: change.entity_id,
+            schema_key: change.schema_key,
+            file_id: change.file_id,
+        })),
+    });
+    // simulating graph relation
+    const cs2 = await createChangeSet({
+        lix,
+        elements: [changes[2]].map((change) => ({
+            change_id: change.id,
+            entity_id: change.entity_id,
+            schema_key: change.schema_key,
+            file_id: change.file_id,
+        })),
+        parents: [cs1],
+    });
+    const merged = await createMergeChangeSet({
+        lix,
+        source: cs0,
+        target: cs2,
+    });
+    const mergedElements = await lix.db
+        .selectFrom("change_set_element")
+        .where("change_set_element.change_set_id", "=", merged.id)
+        .selectAll()
+        .execute();
+    expect(mergedElements).toHaveLength(3);
+    expect(mergedElements.map((e) => e.change_id).sort()).toEqual([changes[0].id, changes[1].id, changes[2].id].sort());
+});
+test("should handle conflicting elements with source winning (until conflicts are modeled in lix)", async () => {
+    const lix = await openLix({});
+    await lix.db
+        .insertInto("stored_schema")
+        .values({
+        value: {
+            "x-lix-key": "s1",
+            "x-lix-version": "1.0",
+            additionalProperties: false,
+            type: "object",
+            properties: {
+                id: { type: "string" },
+                text: { type: "string" },
+            },
+            required: ["id"],
+        },
+    })
+        .execute();
+    // Create changes for the different states of the same entity
+    const changes = await lix.db
+        .insertInto("change")
+        .values([
+        {
+            id: "c_base",
+            schema_key: "s1",
+            schema_version: "1.0",
+            entity_id: "e1",
+            file_id: "file1",
+            plugin_key: "mock_plugin",
+            snapshot_content: { text: "base" },
+        },
+        {
+            id: "c_target",
+            schema_key: "s1",
+            schema_version: "1.0",
+            entity_id: "e1", // Same entity as base, different content
+            file_id: "file1",
+            plugin_key: "mock_plugin",
+            snapshot_content: { text: "target mod" },
+        },
+        {
+            id: "c_source",
+            schema_key: "s1",
+            schema_version: "1.0",
+            entity_id: "e1", // Same entity as base, different content
+            file_id: "file1",
+            plugin_key: "mock_plugin",
+            snapshot_content: { text: "source mod" },
+        },
+    ])
+        .returningAll()
+        .execute();
+    // 1. Base change set with initial content
+    const cs_base = await createChangeSet({
+        lix,
+        elements: [changes[0]].map((change) => ({
+            change_id: change.id,
+            entity_id: change.entity_id,
+            schema_key: change.schema_key,
+            file_id: change.file_id,
+        })),
+    });
+    // 2. Target branch - modifies e1
+    const cs_target = await createChangeSet({
+        lix,
+        elements: [changes[1]].map((change) => ({
+            change_id: change.id,
+            entity_id: change.entity_id,
+            schema_key: change.schema_key,
+            file_id: change.file_id,
+        })),
+        parents: [cs_base],
+    });
+    // 3. Source branch - modifies e1 differently
+    const cs_source = await createChangeSet({
+        lix,
+        elements: [changes[2]].map((change) => ({
+            change_id: change.id,
+            entity_id: change.entity_id,
+            schema_key: change.schema_key,
+            file_id: change.file_id,
+        })),
+        parents: [cs_base],
+    });
+    // 4. Merge source into target
+    const merged = await createMergeChangeSet({
+        lix,
+        source: cs_source,
+        target: cs_target,
+    });
+    // 5. Verify merged change set elements
+    const mergedElements = await lix.db
+        .selectFrom("change_set_element")
+        .where("change_set_element.change_set_id", "=", merged.id)
+        .selectAll()
+        .execute();
+    // The merge should only contain the element from the source change set due to "source wins"
+    expect(mergedElements).toHaveLength(1);
+    expect(mergedElements[0]).toEqual(expect.objectContaining({
+        change_set_id: merged.id,
+        change_id: changes[2].id,
+        entity_id: changes[2].entity_id,
+        schema_key: changes[2].schema_key,
+        file_id: changes[2].file_id,
+    }));
+    // 6. Verify graph structure
+    const edges = await lix.db
+        .selectFrom("change_set_edge")
+        .where("child_id", "=", merged.id)
+        .selectAll()
+        .execute();
+    expect(edges).toHaveLength(2);
+    expect(edges.map((e) => e.parent_id).sort()).toEqual([cs_source.id, cs_target.id].sort());
+});
+//# sourceMappingURL=create-merge-change-set.test.js.map

package/dist/change-set/create-merge-change-set.test.js.map

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

package/dist/change-set/create-transition-change-set.d.ts

@@ -0,0 +1,18 @@
+import type { Lix } from "../lix/index.js";
+import type { ChangeSet } from "./schema.js";
+/**
+ * Creates a change set that enables a transition from a source state
+ * (defined by `sourceChangeSet`) to a target state (defined by `targetChangeSet`).
+ *
+ * Applying the returned change set to the source state will result in a state
+ * that matches the target state.
+ *
+ * - switch between state (switching versions, checkpoints, etc.)
+ * - restore old state (applying the transition set on top of current state)
+ */
+export declare function createTransitionChangeSet(args: {
+    lix: Lix;
+    sourceChangeSet: Pick<ChangeSet, "id">;
+    targetChangeSet: Pick<ChangeSet, "id">;
+}): Promise<ChangeSet>;
+//# sourceMappingURL=create-transition-change-set.d.ts.map

package/dist/change-set/create-transition-change-set.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-transition-change-set.d.ts","sourceRoot":"","sources":["../../src/change-set/create-transition-change-set.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAK7C;;;;;;;;;GASG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,EAAE;IACrD,GAAG,EAAE,GAAG,CAAC;IACT,eAAe,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACvC,eAAe,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;CACvC,GAAG,OAAO,CAAC,SAAS,CAAC,CAgIrB"}

package/dist/change-set/create-transition-change-set.js

@@ -0,0 +1,102 @@
+import { changeSetElementIsLeafOf } from "../query-filter/change-set-element-is-leaf-of.js";
+import { changeSetElementInAncestryOf } from "../query-filter/change-set-element-in-ancestry-of.js";
+import { createChangeSet } from "./create-change-set.js";
+/**
+ * Creates a change set that enables a transition from a source state
+ * (defined by `sourceChangeSet`) to a target state (defined by `targetChangeSet`).
+ *
+ * Applying the returned change set to the source state will result in a state
+ * that matches the target state.
+ *
+ * - switch between state (switching versions, checkpoints, etc.)
+ * - restore old state (applying the transition set on top of current state)
+ */
+export async function createTransitionChangeSet(args) {
+    const executeInTransaction = async (trx) => {
+        // 1. Find leaf changes defining the state AT the *target* change set
+        const leafChangesToApply = await trx
+            .selectFrom("change")
+            .innerJoin("change_set_element", "change_set_element.change_id", "change.id")
+            .where(changeSetElementInAncestryOf([args.targetChangeSet]))
+            .where(changeSetElementIsLeafOf([args.targetChangeSet]))
+            .select([
+            "change.id",
+            "change.entity_id",
+            "change.schema_key",
+            "change.file_id",
+        ])
+            .distinct()
+            .execute();
+        // 2. Find leaf changes that are present in the *source* state but NOT in the *target* state,
+        //    AND whose entity is not being restored by a different change in the target state.
+        const leafEntitiesToDelete = await trx
+            .selectFrom("change")
+            .innerJoin("change_set_element", "change_set_element.change_id", "change.id")
+            // Condition A: The change must be a leaf in the *source* state
+            .where(changeSetElementInAncestryOf([{ id: args.sourceChangeSet.id }]))
+            .where(changeSetElementIsLeafOf([{ id: args.sourceChangeSet.id }]))
+            // Condition B: The change must NOT be a leaf in the *target* state
+            .where(({ not, exists, selectFrom }) => not(exists(selectFrom("change as target_leaf_check")
+            .innerJoin("change_set_element as target_cs_elem", "target_cs_elem.change_id", "target_leaf_check.id")
+            .whereRef("target_leaf_check.id", "=", "change.id")
+            // *** Swapped target and source here relative to previous version ***
+            .where(changeSetElementInAncestryOf([args.targetChangeSet]))
+            .where(changeSetElementIsLeafOf([args.targetChangeSet]))
+            .select("target_leaf_check.id"))))
+            // Condition C: No other change for the *same entity* is a leaf in the *target* state
+            .where(({ not, exists, selectFrom }) => not(exists(selectFrom("change as restored_entity_check")
+            .innerJoin("change_set_element as restored_cs_elem", "restored_cs_elem.change_id", "restored_entity_check.id")
+            .whereRef("restored_entity_check.entity_id", "=", "change.entity_id")
+            // Check if any change for this entity is a leaf AT THE TARGET change set
+            // *** Swapped target and source here relative to previous version ***
+            .where(changeSetElementInAncestryOf([args.targetChangeSet]))
+            .where(changeSetElementIsLeafOf([args.targetChangeSet]))
+            .select("restored_entity_check.id"))))
+            .select([
+            "change.id",
+            "change.entity_id",
+            "change.plugin_key",
+            "change.schema_version",
+            "change.schema_key",
+            "change.file_id",
+        ])
+            .distinct()
+            .execute();
+        const deleteChanges = leafEntitiesToDelete.length > 0
+            ? await trx
+                .insertInto("change")
+                .values(leafEntitiesToDelete.map((c) => ({
+                schema_key: c.schema_key,
+                schema_version: c.schema_version,
+                plugin_key: c.plugin_key,
+                entity_id: c.entity_id,
+                file_id: c.file_id,
+                // delete change
+                snapshot_id: "no-content",
+            })))
+                .returning(["id", "entity_id", "schema_key", "file_id"])
+                .execute()
+            : [];
+        const combinedChanges = [...leafChangesToApply, ...deleteChanges];
+        if (combinedChanges.length === 0) {
+            throw new Error("No changes to apply in the transition change set.");
+        }
+        const transitionChangeSet = await createChangeSet({
+            lix: { ...args.lix, db: trx },
+            elements: combinedChanges.map((change) => ({
+                change_id: change.id,
+                entity_id: change.entity_id,
+                schema_key: change.schema_key,
+                file_id: change.file_id,
+            })),
+        });
+        return transitionChangeSet;
+    };
+    if (args.lix.db.isTransaction) {
+        return executeInTransaction(args.lix.db);
+    }
+    else {
+        return args.lix.db.transaction().execute(executeInTransaction);
+    }
+}
+//# sourceMappingURL=create-transition-change-set.js.map

package/dist/change-set/create-transition-change-set.js.map

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

package/dist/change-set/create-transition-change-set.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=create-transition-change-set.test.d.ts.map

package/dist/change-set/create-transition-change-set.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-transition-change-set.test.d.ts","sourceRoot":"","sources":["../../src/change-set/create-transition-change-set.test.ts"],"names":[],"mappings":""}