npm - @paradigma-inc/flywheel - Versions diffs - 0.2.61 → 0.2.66 - Mend

@paradigma-inc/flywheel 0.2.61 → 0.2.66

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 (50) hide show

package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/edge-restoration.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"edge-restoration.js","sourceRoot":"","sources":["../../../../src/local/domain/rebase/edge-restoration.ts"],"names":[],"mappings":"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"}

package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/graph-membership.js ADDED Viewed

@@ -0,0 +1,351 @@
+import { createHash } from "node:crypto";
+import { RepositoryServiceError } from "../errors.js";
+import { canonicalBytes } from "../models/encoding.js";
+import { snapshotRows } from "../../store/snapshot/schema.js";
+import { operationKey } from "./keys.js";
+// A graph_membership conflict: one side removed graph membership (containment or a
+// needed node) while the other side added or edited a semantic edge that depends on it.
+// An edge is valid only while its graph, source and target are live and both endpoints
+// sit at the same depth beneath the graph through containment, so every containment on
+// the path from each endpoint up to the graph is a dependency of the edge.
+export const GRAPH_MEMBERSHIP = "graph_membership";
+const LIFECYCLE_OPERATIONS = new Set(["node.tombstone.v1", "node.restore.v1", "node.purge.v1", "node.relocate.v1"]);
+/** Graph membership, lifecycle and edge artifact references of one snapshot. */
+class Membership {
+    lifecycle = new Map();
+    containmentByChild = new Map();
+    containmentById = new Map();
+    edges = new Map();
+    edgeReferences = new Map();
+    objectDigests = new Map();
+    constructor(tables) {
+        for (const row of snapshotRows(tables, "repository_nodes"))
+            this.lifecycle.set(row.node_id, row.lifecycle_state);
+        for (const row of snapshotRows(tables, "repository_containments")) {
+            const containment = {
+                containmentId: row.containment_id, containerId: row.container_node_id,
+                childId: row.child_node_id, relationDigest: row.relation_digest,
+                ordinal: row.ordinal, sourceArtifactId: row.source_artifact_id,
+            };
+            this.containmentByChild.set(containment.childId, containment);
+            this.containmentById.set(containment.containmentId, containment);
+        }
+        for (const row of snapshotRows(tables, "repository_semantic_edges")) {
+            this.edges.set(row.edge_id, {
+                edgeId: row.edge_id, graphId: row.graph_node_id, sourceId: row.source_node_id,
+                targetId: row.target_node_id, relationDigest: row.relation_digest,
+            });
+        }
+        for (const row of snapshotRows(tables, "repository_artifacts"))
+            this.objectDigests.set(row.artifact_id, row.object_digest);
+        for (const row of snapshotRows(tables, "repository_artifact_references")) {
+            if (row.owner_kind !== "edge")
+                continue;
+            const references = this.edgeReferences.get(row.owner_id) ?? [];
+            references.push({ artifactId: row.artifact_id, order: row.reference_order });
+            this.edgeReferences.set(row.owner_id, references);
+        }
+    }
+    /** Containments from `nodeId` up to `graphId`, nearest first, or null when the node is not beneath the graph. */
+    path(nodeId, graphId) {
+        const path = [];
+        for (let current = this.containmentByChild.get(nodeId); current !== undefined; current = this.containmentByChild.get(current.containerId)) {
+            // Stores refuse containment cycles, so a longer walk means the snapshot itself is corrupt.
+            if (path.length > this.containmentById.size)
+                throw new RepositoryServiceError("repository containment snapshot is cyclic");
+            path.push(current);
+            if (current.containerId === graphId)
+                return path;
+        }
+        return null;
+    }
+    edgePath(edge) {
+        const source = this.path(edge.sourceId, edge.graphId);
+        const target = this.path(edge.targetId, edge.graphId);
+        return source === null || target === null ? null : [...source, ...target];
+    }
+}
+/** The semantic edge an operation writes: edge operations and edge-owned artifact references. */
+function edgeTarget(operation) {
+    const payload = operation.payload;
+    if (operation.type.startsWith("edge."))
+        return payload.edge_id;
+    const owner = payload.owner;
+    return owner?.owner_type === "edge" ? owner.owner_id : undefined;
+}
+function payloadString(operation, name) {
+    return operation.payload[name];
+}
+/** The `field` value of every operation of `type`. */
+function payloadIds(operations, type, field) {
+    return new Set(operations.filter(operation => operation.type === type).map(operation => payloadString(operation, field)));
+}
+function shares(left, right) {
+    return [...right.edges].some(id => left.edges.has(id)) || [...right.nodes].some(id => left.nodes.has(id)) ||
+        [...right.containments.keys()].some(id => left.containments.has(id));
+}
+/** Merges dependencies that share an edge, node or containment so that one choice covers all of them. */
+function grouped(dependencies) {
+    const groups = [];
+    for (const dependency of dependencies) {
+        const group = {
+            edges: new Set(dependency.edges), graphs: new Set(dependency.graphs),
+            nodes: new Set(dependency.nodes), containments: new Map(dependency.containments),
+        };
+        for (let index = groups.length - 1; index >= 0; index -= 1) {
+            if (!shares(groups[index], group))
+                continue;
+            const [joined] = groups.splice(index, 1);
+            for (const id of joined.edges)
+                group.edges.add(id);
+            for (const id of joined.graphs)
+                group.graphs.add(id);
+            for (const id of joined.nodes)
+                group.nodes.add(id);
+            for (const [id, containment] of joined.containments)
+                group.containments.set(id, containment);
+        }
+        groups.push(group);
+    }
+    return groups;
+}
+function conflict(removalSide, group, localOperations, remoteOperations) {
+    const edgeIds = [...group.edges].sort();
+    return {
+        key: ["graph-membership", removalSide, ...edgeIds],
+        removalSide,
+        graphNodeIds: [...group.graphs].sort(),
+        edgeIds,
+        nodeIds: [...group.nodes].sort(),
+        containmentIds: [...group.containments.keys()].sort(),
+        localOperations,
+        remoteOperations,
+    };
+}
+/** Local edge additions whose containment path or graph/endpoint lifecycle the remote history removed. */
+function remoteRemovals(input, local, remote) {
+    const createdNodes = payloadIds(input.localOperations, "node.create.v1", "node_id");
+    const assigned = payloadIds(input.localOperations, "containment.assign.v1", "containment_id");
+    const dependencies = [];
+    for (const operation of input.localOperations) {
+        if (operation.type !== "edge.add.v1")
+            continue;
+        const edge = {
+            graphId: payloadString(operation, "graph_node_id"),
+            sourceId: payloadString(operation, "source_node_id"),
+            targetId: payloadString(operation, "target_node_id"),
+        };
+        const path = local.edgePath(edge);
+        if (path === null)
+            continue;
+        const containments = new Map(path
+            .filter(containment => !assigned.has(containment.containmentId) &&
+            remote.containmentByChild.get(containment.childId)?.containerId !== containment.containerId)
+            .map(containment => [containment.containmentId, containment]));
+        const nodes = new Set([edge.graphId, edge.sourceId, edge.targetId]
+            .filter(nodeId => !createdNodes.has(nodeId) && remote.lifecycle.get(nodeId) !== "live"));
+        if (containments.size === 0 && nodes.size === 0)
+            continue;
+        for (const containment of containments.values())
+            nodes.add(containment.childId);
+        dependencies.push({ edges: new Set([payloadString(operation, "edge_id")]), graphs: new Set([edge.graphId]), nodes, containments });
+    }
+    return grouped(dependencies).map(group => {
+        const introducedArtifacts = new Set();
+        const localOperations = input.localOperations.filter(operation => {
+            const artifactId = operation.payload.artifact_id;
+            if (artifactId !== undefined && introducedArtifacts.has(artifactId))
+                return true;
+            const edgeId = edgeTarget(operation);
+            if (edgeId === undefined || !group.edges.has(edgeId))
+                return false;
+            if (artifactId !== undefined && !remote.objectDigests.has(artifactId))
+                introducedArtifacts.add(artifactId);
+            return true;
+        });
+        const remoteOperations = input.remoteOperations.filter(operation => (operation.type.startsWith("containment.") && group.nodes.has(payloadString(operation, "child_node_id"))) ||
+            (LIFECYCLE_OPERATIONS.has(operation.type) && group.nodes.has(payloadString(operation, "node_id"))));
+        return conflict("remote", group, localOperations, remoteOperations);
+    });
+}
+/** Remote edges that need a containment the local history removed. */
+function localRemovals(input, remote) {
+    const removals = new Map(input.localOperations
+        .filter(op => op.type === "containment.remove.v1" && remote.containmentById.has(payloadString(op, "containment_id")))
+        .map(op => [payloadString(op, "containment_id"), remote.containmentById.get(payloadString(op, "containment_id"))]));
+    if (removals.size === 0)
+        return [];
+    const locallyRemovedEdges = payloadIds(input.localOperations, "edge.remove.v1", "edge_id");
+    const remotelyWrittenEdges = new Set(input.remoteOperations.map(edgeTarget).filter(id => id !== undefined));
+    const dependencies = [];
+    const edgePaths = new Map();
+    for (const edge of remote.edges.values()) {
+        const path = remote.edgePath(edge) ?? [];
+        const removed = new Map(path.filter(containment => removals.has(containment.containmentId))
+            .map(containment => [containment.containmentId, containment]));
+        if (removed.size === 0 || (locallyRemovedEdges.has(edge.edgeId) && !remotelyWrittenEdges.has(edge.edgeId)))
+            continue;
+        edgePaths.set(edge.edgeId, path);
+        dependencies.push({
+            edges: new Set([edge.edgeId]), graphs: new Set([edge.graphId]),
+            nodes: new Set([...removed.values()].map(containment => containment.childId)), containments: removed,
+        });
+    }
+    return grouped(dependencies).map(group => {
+        const pathIds = new Set([...group.edges].flatMap(edgeId => edgePaths.get(edgeId).map(containment => containment.containmentId)));
+        const localOperations = input.localOperations.filter(operation => {
+            const key = operationKey(operation);
+            return (key[0] === "containment" && group.nodes.has(key[1])) || (key[0] === "edge" && group.edges.has(key[1]));
+        });
+        const remoteOperations = input.remoteOperations.filter(operation => {
+            const edgeId = edgeTarget(operation);
+            return (edgeId !== undefined && group.edges.has(edgeId)) ||
+                (operation.type === "containment.assign.v1" && pathIds.has(payloadString(operation, "containment_id")));
+        });
+        return conflict("local", group, localOperations, remoteOperations);
+    });
+}
+export function graphMembershipConflicts(input) {
+    const addsEdges = input.localOperations.some(op => op.type === "edge.add.v1");
+    const removesContainment = input.localOperations.some(op => op.type === "containment.remove.v1");
+    if (!addsEdges && !removesContainment)
+        return [];
+    const remote = new Membership(input.remoteTables());
+    return [
+        ...(addsEdges ? remoteRemovals(input, new Membership(input.localTables()), remote) : []),
+        ...(removesContainment ? localRemovals(input, remote) : []),
+    ];
+}
+export const NO_GRAPH_MEMBERSHIP_PLAN = { drop: new Set(), insertBefore: new Map() };
+function digest(value) {
+    return `sha256:${createHash("sha256").update(canonicalBytes(value)).digest("hex")}`;
+}
+function refusal(choice, message, reason, details) {
+    return new RepositoryServiceError(`Cannot keep the edge in conflict ${choice.conflictId}: ${message}`, {
+        code: "repository_conflict_choice_unavailable",
+        details: { conflict_id: choice.conflictId, strategy: choice.strategy, reason, ...details },
+        nextAction: `Keep the removal with flywheel repo:conflicts:resolve ${choice.conflictId} --strategy ${choice.removalSide}, ` +
+            `or abandon the pull with flywheel repo:rebase:abort ${choice.rebaseId}.`,
+    });
+}
+/**
+ * Replay plan for one resolved graph_membership conflict. Choosing the removal side drops only the
+ * dependent edge work; choosing the edge side keeps only the containment that edge needs. Throws
+ * repository_conflict_choice_unavailable when the edge cannot be kept, before anything is recorded.
+ */
+export function graphMembershipPlan(choice, input) {
+    const participants = new Set(choice.localOperationIds);
+    const anchor = choice.localOperationIds[0];
+    const keepsRemoval = choice.strategy === choice.removalSide;
+    if (choice.removalSide === "remote" && keepsRemoval)
+        return { drop: participants, insertBefore: new Map() };
+    const remote = new Membership(input.remoteTables());
+    if (choice.removalSide === "local" && keepsRemoval) {
+        const detached = new Set(input.localOperations.filter(op => op.type === "artifact.detach.v1")
+            .map(op => `${edgeTarget(op)}\u0000${payloadString(op, "artifact_id")}`));
+        const removed = payloadIds(input.localOperations, "edge.remove.v1", "edge_id");
+        const inserted = [];
+        for (const edgeId of choice.edgeIds) {
+            const edge = remote.edges.get(edgeId);
+            if (edge === undefined)
+                continue;
+            for (const { artifactId, order } of remote.edgeReferences.get(edgeId) ?? []) {
+                if (detached.has(`${edgeId}\u0000${artifactId}`))
+                    continue;
+                const objectDigest = remote.objectDigests.get(artifactId);
+                inserted.push({
+                    type: "artifact.detach.v1", repository_id: input.repositoryId, artifact_id: artifactId,
+                    owner: { owner_type: "edge", owner_id: edgeId }, expected_reference_state: "present", object_digest: objectDigest,
+                    reference_digest: digest({ artifact_id: artifactId, object_digest: objectDigest, owner_kind: "edge", owner_id: edgeId, reference_order: order }),
+                });
+            }
+            if (!removed.has(edgeId)) {
+                inserted.push({
+                    type: "edge.remove.v1", repository_id: input.repositoryId, edge_id: edgeId,
+                    expected_relation_state: "present", relation_digest: edge.relationDigest,
+                });
+            }
+        }
+        return { drop: new Set(), insertBefore: new Map(inserted.length === 0 ? [] : [[anchor, inserted]]) };
+    }
+    const local = new Membership(input.localTables());
+    if (choice.removalSide === "local") {
+        const droppedContainments = new Set(input.localOperations
+            .filter(op => participants.has(op.operationId) && op.type === "containment.assign.v1")
+            .map(op => payloadString(op, "containment_id")));
+        for (const operation of input.localOperations) {
+            if (participants.has(operation.operationId) || operation.type !== "edge.add.v1")
+                continue;
+            const path = local.edgePath({
+                graphId: payloadString(operation, "graph_node_id"),
+                sourceId: payloadString(operation, "source_node_id"),
+                targetId: payloadString(operation, "target_node_id"),
+            }) ?? [];
+            if (path.some(containment => droppedContainments.has(containment.containmentId))) {
+                throw refusal(choice, `local operation ${operation.operationId} (${operation.type}) depends on the local containment ` +
+                    "change that this choice drops.", "dependent_local_work", { operation_id: operation.operationId });
+            }
+        }
+        return { drop: participants, insertBefore: new Map() };
+    }
+    const createdNodes = payloadIds(input.localOperations, "node.create.v1", "node_id");
+    const containments = choice.containmentIds.map(id => {
+        const containment = local.containmentById.get(id);
+        if (containment === undefined)
+            throw new RepositoryServiceError("repository conflict containment is unavailable");
+        return containment;
+    });
+    const needed = new Set();
+    for (const operation of input.localOperations) {
+        if (!participants.has(operation.operationId) || operation.type !== "edge.add.v1")
+            continue;
+        for (const name of ["graph_node_id", "source_node_id", "target_node_id"])
+            needed.add(payloadString(operation, name));
+    }
+    for (const containment of containments) {
+        needed.add(containment.containerId);
+        needed.add(containment.childId);
+    }
+    for (const nodeId of [...needed].sort()) {
+        const lifecycle = remote.lifecycle.get(nodeId);
+        if (lifecycle === "live" || createdNodes.has(nodeId))
+            continue;
+        if (lifecycle === "purged") {
+            throw refusal(choice, `node ${nodeId} was purged in the remote history, and purged content is never restored.`, "purged", { node_id: nodeId });
+        }
+        if (lifecycle === "tombstoned") {
+            throw refusal(choice, `node ${nodeId} is tombstoned in the remote history, and resolving a conflict never restores a node.`, "tombstoned", { node_id: nodeId });
+        }
+        const relocation = input.remoteOperations.findLast(op => op.type === "node.relocate.v1" && op.payload.node_id === nodeId);
+        if (relocation !== undefined) {
+            const target = payloadString(relocation, "target_repository_id");
+            throw refusal(choice, `node ${nodeId} moved to repository ${target}, and resolving a conflict never reverses a repository move.`, "relocated", {
+                node_id: nodeId, current_repository_id: target,
+            });
+        }
+        throw refusal(choice, `node ${nodeId} is not in the remote history.`, "absent", { node_id: nodeId });
+    }
+    for (const containment of containments) {
+        const current = remote.containmentByChild.get(containment.childId);
+        if (current !== undefined) {
+            throw refusal(choice, `node ${containment.childId} is now inside ${current.containerId} in the remote history; ` +
+                `keeping the edge would move it back under ${containment.containerId}.`, "moved", {
+                node_id: containment.childId, container_node_id: current.containerId,
+            });
+        }
+        if (containment.containerId === containment.childId || remote.path(containment.containerId, containment.childId) !== null) {
+            throw refusal(choice, `restoring ${containment.childId} under ${containment.containerId} would create a containment cycle.`, "cycle", {
+                node_id: containment.childId, container_node_id: containment.containerId,
+            });
+        }
+    }
+    return {
+        drop: new Set(),
+        insertBefore: new Map([[anchor, containments.map(containment => ({
+                    type: "containment.assign.v1", repository_id: input.repositoryId, containment_id: containment.containmentId,
+                    container_node_id: containment.containerId, child_node_id: containment.childId, expected_relation_state: "absent",
+                    relation_digest: containment.relationDigest, ordinal: containment.ordinal, source_artifact_id: containment.sourceArtifactId,
+                }))]]),
+    };
+}
+//# sourceMappingURL=graph-membership.js.map

package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/graph-membership.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"graph-membership.js","sourceRoot":"","sources":["../../../../src/local/domain/rebase/graph-membership.ts"],"names":[],"mappings":"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"}

package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/pull.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { RepositoryServiceError } from "../errors.js";
 import { isDigest, isUuid } from "../models/constants.js";
-import { buildConflicts } from "./conflicts.js";
+import { conflictsForContext } from "./conflicts.js";
 import { loadRebaseLatestValues, rebaseLocalCommits } from "./replay.js";
 const NO_CONFLICTS = [];
 function pulledDepartures(repositoryId, commits) {
@@ -32,7 +32,7 @@ export async function applyPull(store, repositoryId, clientId, pullId, sessionMa
         }
         return { repositoryId, pullId, rebaseId: null, head: workspace.localHeadCommitId, remoteTrackingHead: workspace.remoteTrackingHeadCommitId, departures: [], conflicts: [] };
     }
-    const localCommits = await localUnpublishedCommits(store, workspace);
+    const localCommits = await localCommitsAfter(store, repositoryId, workspace.localHeadCommitId, workspace.remoteTrackingHeadCommitId);
     const localSnapshot = await store.loadSnapshot(repositoryId, workspace.localHeadCommitId);
     const context = {
         ...(sessionManifest.actorPrincipalId === undefined ? {} : { actorPrincipalId: sessionManifest.actorPrincipalId }),
@@ -63,10 +63,7 @@ export async function applyPull(store, repositoryId, clientId, pullId, sessionMa
             conflicts: [],
         };
     }
-    const conflicts = buildConflicts({
-        repositoryId, rebaseId: pullId, localCommitsNewestFirst: localCommits,
-        remoteCommits: sessionManifest.commits, context,
-    });
+    const conflicts = conflictsForContext(repositoryId, pullId, context);
     if (conflicts.length > 0) {
         const rebase = {
             repositoryId, rebaseId: pullId, state: "open", baseCommitId: requirePullTarget(sessionManifest), pendingResolutionDigest: null,
@@ -110,15 +107,16 @@ export async function loadConflict(store, repositoryId, conflictId) {
         throw new RepositoryServiceError("repository conflict is not active");
     return conflict;
 }
-export async function localUnpublishedCommits(store, workspace) {
-    if (workspace.localHeadCommitId === workspace.remoteTrackingHeadCommitId)
+/** Local history from `head` back to, but excluding, `base`, newest first. */
+export async function localCommitsAfter(store, repositoryId, head, base) {
+    if (head === base)
         return [];
     const commits = [];
     let afterCommitId = null;
     while (true) {
-        const page = await store.listCommits(workspace.repositoryId, workspace.localHeadCommitId, afterCommitId, 256);
+        const page = await store.listCommits(repositoryId, head, afterCommitId, 256);
         for (const commit of page.commits) {
-            if (commit.commitId === workspace.remoteTrackingHeadCommitId)
+            if (commit.commitId === base)
                 return commits;
             commits.push(commit);
         }
@@ -128,11 +126,27 @@ export async function localUnpublishedCommits(store, workspace) {
             throw new RepositoryServiceError("repository history cursor did not advance");
         afterCommitId = page.nextCommitId;
     }
-    if (workspace.remoteTrackingHeadCommitId !== null) {
+    if (base !== null) {
         throw new RepositoryServiceError("repository remote-tracking head is outside local history");
     }
     return commits;
 }
+/**
+ * An open rebase's saved context, extended to the actual local history: a
+ * commit made while the rebase is open is part of the local side it replays.
+ * Returns `saved` itself when no such commit exists.
+ */
+export async function extendRebaseContext(store, workspace, saved) {
+    const localCommits = await localCommitsAfter(store, workspace.repositoryId, workspace.localHeadCommitId, saved.oldRemoteHead);
+    if (localCommits.length === saved.localCommits.length &&
+        localCommits.every((commit, index) => commit.commitId === saved.localCommits[index].commitId))
+        return saved;
+    return {
+        ...saved,
+        localCommits,
+        localSnapshot: await store.loadSnapshot(workspace.repositoryId, workspace.localHeadCommitId),
+    };
+}
 export function validatePullManifest(repositoryId, expectedRemoteHead, manifest) {
     if (manifest.repositoryId !== repositoryId || manifest.snapshot.repositoryId !== repositoryId ||
         manifest.snapshot.headCommitId !== manifest.targetHead ||

package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/pull.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../src/local/domain/rebase/pull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAK1D,OAAO,EAAE,~~cAAc~~,EAAE,MAAM,gBAAgB,CAAC;~~AAGhD~~,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACzE,MAAM,YAAY,GAA8B,EAAE,CAAC;AAEnD,SAAS,gBAAgB,CACvB,YAAoB,EACpB,OAAoC;IAEpC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAC;IAChD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YAC1C,IAAI,SAAS,CAAC,IAAI,KAAK,kBAAkB;gBACvC,SAAS,CAAC,OAAO,CAAC,oBAAoB,KAAK,YAAY;gBACvD,OAAO,SAAS,CAAC,OAAO,CAAC,OAAO,KAAK,QAAQ;gBAC7C,OAAO,SAAS,CAAC,OAAO,CAAC,oBAAoB,KAAK,QAAQ,EAAE,CAAC;gBAC7D,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;YACvF,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SAC3E,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,KAAwB,EACxB,YAAoB,EACpB,QAAgB,EAChB,MAAc,EACd,eAAoC,EACpC,QAAoB,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE;IAEpC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAAE,MAAM,IAAI,sBAAsB,CAAC,wBAAwB,CAAC,CAAC;IAChF,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;IAC1D,IAAI,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3G,MAAM,IAAI,sBAAsB,CAAC,sCAAsC,CAAC,CAAC;IAC3E,CAAC;IACD,oBAAoB,CAAC,YAAY,EAAE,SAAS,CAAC,0BAA0B,EAAE,eAAe,CAAC,CAAC;IAC1F,IAAI,eAAe,CAAC,UAAU,KAAK,SAAS,CAAC,0BAA0B,EAAE,CAAC;QACxE,IAAI,eAAe,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACnD,MAAM,KAAK,CAAC,sBAAsB,EAAE,CAAC,YAAY,EAAE,eAAe,CAAC,gBAAgB,CAAC,CAAC;QACvF,CAAC;QACD,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,SAAS,CAAC,0BAA0B,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC9K,CAAC;IACD,MAAM,YAAY,GAAG,MAAM,~~uBAAuB~~,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;~~IACrE~~,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC1F,MAAM,OAAO,GAAkB;QAC7B,GAAG,CAAC,eAAe,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,eAAe,CAAC,gBAAgB,EAAE,CAAC;QACjH,aAAa,EAAE,SAAS,CAAC,0BAA0B;QACnD,UAAU,EAAE,iBAAiB,CAAC,eAAe,CAAC;QAC9C,oBAAoB,EAAE,SAAS,CAAC,qBAAqB;QACrD,iBAAiB,EAAE,SAAS,CAAC,sBAAsB;QACnD,YAAY,EAAE,eAAe,CAAC,YAAY,IAAI,EAAE;QAChD,UAAU,EAAE,eAAe,CAAC,UAAU;QACtC,iBAAiB,EAAE,eAAe,CAAC,iBAAiB;QACpD,cAAc,EAAE,eAAe,CAAC,cAAc;QAC9C,aAAa,EAAE,eAAe,CAAC,OAAO;QACtC,kBAAkB,EAAE,eAAe,CAAC,oBAAoB;QACxD,cAAc,EAAE,eAAe,CAAC,QAAQ;QACxC,YAAY;QACZ,aAAa;KACd,CAAC;IACF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC;YAC/C,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,OAAO;YACxC,OAAO,EAAE,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,eAAe,CAAC,oBAAoB;YACpF,aAAa,EAAE,eAAe,CAAC,UAAU,EAAE,MAAM;SAClD,CAAC,CAAC,CAAC;QACJ,OAAO;YACL,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ;YAChE,kBAAkB,EAAE,eAAe,CAAC,UAAU;YAC9C,UAAU,EAAE,gBAAgB,CAAC,YAAY,EAAE,eAAe,CAAC,OAAO,CAAC;YACnE,SAAS,EAAE,EAAE;SACd,CAAC;IACJ,CAAC;IACD,MAAM,SAAS,GAAG,~~cAAc~~,CAAC~~;QAC/B~~,YAAY,EAAE,~~QAAQ,EAAE,~~MAAM,EAAE,~~uBAAuB,EAAE,YAAY;QACrE,aAAa,EAAE,eAAe,CAAC,~~OAAO,~~EAAE,OAAO;KAChD,~~CAAC,CAAC;~~IACH~~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~~uBAAuB~~,~~CAAC~~,KAAwB,EAAE,~~SAAyB;IAC/F~~,~~IAAI~~,~~SAAS~~,~~CAAC~~,~~iBAAiB~~,~~KAAK~~,~~SAAS~~,~~CAAC~~,~~0BAA0B~~;QAAE,OAAO,EAAE,CAAC;~~IACpF~~,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,IAAI,aAAa,GAAkB,IAAI,CAAC;IACxC,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,~~SAAS,CAAC,~~YAAY,EAAE,~~SAAS~~,~~CAAC,iBAAiB,~~EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;~~QAC9G~~,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAClC,IAAI,MAAM,CAAC,QAAQ,KAAK,~~SAAS,CAAC,0BAA0B~~;gBAAE,OAAO,OAAO,CAAC;~~YAC7E~~,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI;YAAE,MAAM;QACtC,IAAI,IAAI,CAAC,YAAY,KAAK,aAAa;YAAE,MAAM,IAAI,sBAAsB,CAAC,2CAA2C,CAAC,CAAC;QACvH,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;IACpC,CAAC;IACD,IAAI,~~SAAS~~,~~CAAC,0BAA0B,~~KAAK,IAAI,EAAE,CAAC;~~QAClD~~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"}
1	+ {"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../src/local/domain/rebase/pull.ts"],"names":[],"mappings":"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"}