@tinyrack/dotweave 0.42.13 → 0.42.21

package/dist/services/{local-materialization.js → pull-apply.js}

@@ -1,74 +1,104 @@
 import { realpathSync } from "node:fs";
 import { chmod, mkdir, mkdtemp, readFile, readlink, rm, } from "node:fs/promises";
-import { basename, dirname, isAbsolute, join, posix, resolve } from "node:path";
-import { CONSTANTS } from "#app/config/constants.ts";
-import { collectChildEntryPaths, findOwningSyncEntry, resolveSyncRule, } from "#app/config/sync.ts";
+import { basename, dirname, join, posix } from "node:path";
+import { AppConstants } from "#app/config/constants.ts";
+import { collectChildEntryPaths, findOwningSyncEntry, resolveSyncRule, } from "#app/config/sync-queries.ts";
 import { fileContentsEqual, shouldNormalizeTextLineEndings, } from "#app/lib/content.ts";
 import { DotweaveError } from "#app/lib/error.ts";
-import { buildExecutableMode, buildSearchableDirectoryMode, supportsPosixFileModes, } from "#app/lib/file-mode.ts";
+import { buildSearchableDirectoryMode, isExecutableMode, supportsPosixFileModes, } from "#app/lib/file-mode.ts";
 import { createSymlink, getFollowedPathStats, getPathStats, listDirectoryEntries, removePathAtomically, replacePathAtomically, writeFileNode, } from "#app/lib/filesystem.ts";
-import { buildDirectoryKey } from "#app/lib/path.ts";
+import { buildDirectoryKey, normalizeLinkTarget } from "#app/lib/path.ts";
 import { limitConcurrency } from "#app/lib/promise.ts";
-const reportPullPlanningProgress = (reporter, state, repoPath) => {
-    state.scannedLocalNodeCount += 1;
-    if ((reporter?.level ?? 0) >= 4) {
-        reporter?.verbose(`scanned local path ${repoPath} while planning pull`);
-        return;
+export const buildDesiredDirectoryKeys = (entry, desiredNodes) => {
+    const desiredDirectoryKeys = new Set([
+        buildDirectoryKey(entry.repoPath),
+    ]);
+    for (const relativePath of desiredNodes.keys()) {
+        const segments = relativePath.split("/");
+        for (let index = 1; index < segments.length; index += 1) {
+            desiredDirectoryKeys.add(buildDirectoryKey(posix.join(entry.repoPath, ...segments.slice(0, index))));
+        }
     }
-    if (state.scannedLocalNodeCount % 100 === 0) {
-        reporter?.start(`Scanned ${state.scannedLocalNodeCount} local paths while planning pull...`);
+    return desiredDirectoryKeys;
+};
+export const buildEntryMaterialization = (entry, snapshot, config) => {
+    if (entry.kind === "file") {
+        const node = snapshot.get(entry.repoPath);
+        if (node === undefined) {
+            return {
+                desiredKeys: new Set(),
+                type: "absent",
+            };
+        }
+        if (node.type === "directory") {
+            throw new DotweaveError("File sync entry resolves to a directory in the repository.", {
+                code: "FILE_ENTRY_RESOLVES_DIRECTORY",
+                details: [`Repository path: ${entry.repoPath}`],
+                hint: "Run 'dotweave push' or fix the repository so this path is stored as a file.",
+            });
+        }
+        return {
+            desiredKeys: new Set([entry.repoPath]),
+            node,
+            type: "file",
+        };
     }
+    const rootNode = snapshot.get(entry.repoPath);
+    if (rootNode !== undefined && rootNode.type !== "directory") {
+        throw new DotweaveError("Directory sync entry resolves to a file in the repository.", {
+            code: "DIRECTORY_ENTRY_RESOLVES_FILE",
+            details: [`Repository path: ${entry.repoPath}`],
+            hint: "Run 'dotweave push' or fix the repository so this path is stored as a directory.",
+        });
+    }
+    const nodes = new Map();
+    const desiredKeys = new Set();
+    for (const [repoPath, node] of snapshot.entries()) {
+        if (!repoPath.startsWith(`${entry.repoPath}/`)) {
+            continue;
+        }
+        if (node.type === "directory") {
+            continue;
+        }
+        if (findOwningSyncEntry(config, repoPath) !== entry) {
+            continue;
+        }
+        const relativePath = repoPath.slice(entry.repoPath.length + 1);
+        nodes.set(relativePath, node);
+        desiredKeys.add(repoPath);
+    }
+    if (rootNode === undefined && nodes.size === 0) {
+        return {
+            desiredKeys,
+            type: "absent",
+        };
+    }
+    desiredKeys.add(buildDirectoryKey(entry.repoPath));
+    return {
+        desiredKeys,
+        nodes,
+        type: "directory",
+    };
 };
 const materializedDirectoryModeMatches = (actualMode, fileMode) => {
     if (!supportsPosixFileModes()) {
         return true;
     }
-    const maskedActualMode = actualMode & 0o777;
     if (fileMode === undefined) {
-        // If no explicit mode, we check if owner has full access and others have at least read/search.
-        // We allow group-write (0775 vs 0755) common in some umasks.
-        const ownerAndSearchMask = 0o711;
-        return (maskedActualMode & ownerAndSearchMask) === ownerAndSearchMask;
+        return true;
     }
+    const maskedActualMode = actualMode & 0o777;
     return maskedActualMode === (buildSearchableDirectoryMode(fileMode) & 0o777);
 };
 const materializedFileModeMatches = (actualMode, executable, fileMode) => {
     if (!supportsPosixFileModes()) {
         return true;
     }
-    const expectedMode = (fileMode ?? buildExecutableMode(executable)) & 0o777;
     const maskedActualMode = actualMode & 0o777;
-    if (maskedActualMode === expectedMode) {
-        return true;
-    }
-    // If no explicit fileMode is provided, we allow common umask variations (like 0664 vs 0644)
-    // as long as the owner permissions and executable bits match.
     if (fileMode === undefined) {
-        const ownerAndExecMask = 0o711; // Owner read/write/exec + Group/Other exec
-        return ((maskedActualMode & ownerAndExecMask) ===
-            (expectedMode & ownerAndExecMask));
-    }
-    return false;
-};
-const normalizeLinkTargetForComparison = (target, baseDir) => {
-    const absoluteTarget = isAbsolute(target) ? target : resolve(baseDir, target);
-    if (process.platform !== "win32") {
-        return absoluteTarget;
-    }
-    const normalizeSlashes = (p) => p.replaceAll("\\", "/").toLowerCase();
-    try {
-        return normalizeSlashes(require("node:fs").realpathSync.native(absoluteTarget));
-    }
-    catch {
-        try {
-            const dir = dirname(absoluteTarget);
-            const base = basename(absoluteTarget);
-            return normalizeSlashes(join(require("node:fs").realpathSync.native(dir), base));
-        }
-        catch {
-            return normalizeSlashes(absoluteTarget);
-        }
+        return isExecutableMode(maskedActualMode) === executable;
     }
+    return maskedActualMode === (fileMode & 0o777);
 };
 const isMaterializedFileLikeNodeCurrent = async (targetPath, node, fileMode) => {
     const stats = await getPathStats(targetPath);
@@ -80,8 +110,8 @@ const isMaterializedFileLikeNodeCurrent = async (targetPath, node, fileMode) =>
             return false;
         }
         const currentLinkTarget = await readlink(targetPath);
-        return (normalizeLinkTargetForComparison(currentLinkTarget, dirname(targetPath)) ===
-            normalizeLinkTargetForComparison(node.linkTarget, dirname(targetPath)));
+        return (normalizeLinkTarget(currentLinkTarget, dirname(targetPath)) ===
+            normalizeLinkTarget(node.linkTarget, dirname(targetPath)));
     }
     if (!stats.isFile()) {
         return false;
@@ -103,8 +133,7 @@ const resolveStagingParentDirectory = (targetPath) => {
         return parentDirectory;
     }
 };
-const stageAndReplaceFilePath = async (targetPath, node, reporter, fileMode) => {
-    reporter?.verbose(`staging local file ${targetPath}`);
+const stageAndReplacePath = async (targetPath, node, fileMode) => {
     await mkdir(dirname(targetPath), { recursive: true });
     const stagingDirectory = await mkdtemp(join(resolveStagingParentDirectory(targetPath), `.${basename(targetPath)}.dotweave-sync-`));
     const stagedPath = join(stagingDirectory, basename(targetPath));
@@ -152,90 +181,12 @@ const ensureMaterializedDirectoryPath = async (targetPath, fileMode) => {
         await chmod(targetPath, buildSearchableDirectoryMode(fileMode));
     }
 };
-const buildDesiredDirectoryKeys = (entry, desiredNodes) => {
-    const desiredDirectoryKeys = new Set([
-        buildDirectoryKey(entry.repoPath),
-    ]);
-    for (const relativePath of desiredNodes.keys()) {
-        const segments = relativePath.split("/");
-        for (let index = 1; index < segments.length; index += 1) {
-            desiredDirectoryKeys.add(buildDirectoryKey(posix.join(entry.repoPath, ...segments.slice(0, index))));
-        }
-    }
-    return desiredDirectoryKeys;
-};
-export const buildEntryMaterialization = (entry, snapshot, config, reporter) => {
-    if (entry.kind === "file") {
-        const node = snapshot.get(entry.repoPath);
-        if (node === undefined) {
-            reporter?.verbose(`planned an absent local file ${entry.repoPath}`);
-            return {
-                desiredKeys: new Set(),
-                type: "absent",
-            };
-        }
-        if (node.type === "directory") {
-            throw new DotweaveError("File sync entry resolves to a directory in the repository.", {
-                code: "FILE_ENTRY_RESOLVES_DIRECTORY",
-                details: [`Repository path: ${entry.repoPath}`],
-                hint: "Run 'dotweave push' or fix the repository so this path is stored as a file.",
-            });
-        }
-        reporter?.verbose(`planned a local file ${entry.repoPath}`);
-        return {
-            desiredKeys: new Set([entry.repoPath]),
-            node,
-            type: "file",
-        };
-    }
-    const rootNode = snapshot.get(entry.repoPath);
-    if (rootNode !== undefined && rootNode.type !== "directory") {
-        throw new DotweaveError("Directory sync entry resolves to a file in the repository.", {
-            code: "DIRECTORY_ENTRY_RESOLVES_FILE",
-            details: [`Repository path: ${entry.repoPath}`],
-            hint: "Run 'dotweave push' or fix the repository so this path is stored as a directory.",
-        });
-    }
-    const nodes = new Map();
-    const desiredKeys = new Set();
-    for (const [repoPath, node] of snapshot.entries()) {
-        if (!repoPath.startsWith(`${entry.repoPath}/`)) {
-            continue;
-        }
-        if (node.type === "directory") {
-            continue;
-        }
-        if (findOwningSyncEntry(config, repoPath) !== entry) {
-            continue;
-        }
-        const relativePath = repoPath.slice(entry.repoPath.length + 1);
-        nodes.set(relativePath, node);
-        desiredKeys.add(repoPath);
-    }
-    if (rootNode === undefined && nodes.size === 0) {
-        reporter?.verbose(`planned an absent local directory ${entry.repoPath}`);
-        return {
-            desiredKeys,
-            type: "absent",
-        };
-    }
-    desiredKeys.add(buildDirectoryKey(entry.repoPath));
-    reporter?.verbose(`planned a local directory ${entry.repoPath}`);
-    return {
-        desiredKeys,
-        nodes,
-        type: "directory",
-    };
-};
-const collectLocalLeafKeys = async (targetPath, repoPathPrefix, keys, keyToLocalPath, childEntryPaths, prefix, reporter, progressState = {
-    scannedLocalNodeCount: 0,
-}, providedStats) => {
+export const collectLocalLeafKeys = async (targetPath, repoPathPrefix, keys, keyToLocalPath, childEntryPaths, prefix, providedStats) => {
     const stats = providedStats ?? (await getPathStats(targetPath));
     if (stats === undefined) {
         return;
     }
     if (!stats.isDirectory()) {
-        reportPullPlanningProgress(reporter, progressState, repoPathPrefix);
         keys.add(repoPathPrefix);
         keyToLocalPath?.set(repoPathPrefix, targetPath);
         return;
@@ -256,9 +207,8 @@ const collectLocalLeafKeys = async (targetPath, repoPathPrefix, keys, keyToLocal
         if (childEntryPaths.has(repoPath)) {
             continue;
         }
-        reportPullPlanningProgress(reporter, progressState, repoPath);
         if (childStats?.isDirectory()) {
-            await collectLocalLeafKeys(absolutePath, repoPathPrefix, keys, keyToLocalPath, childEntryPaths, relativePath, reporter, progressState);
+            await collectLocalLeafKeys(absolutePath, repoPathPrefix, keys, keyToLocalPath, childEntryPaths, relativePath);
             continue;
         }
         keys.add(repoPath);
@@ -268,7 +218,7 @@ const collectLocalLeafKeys = async (targetPath, repoPathPrefix, keys, keyToLocal
 const buildLocalPathDepth = (localPath) => {
     return localPath.split(/[/\\]+/u).length;
 };
-const collectDeletableLocalKeys = async (existingKeys, desiredKeys, keyToLocalPath) => {
+export const collectDeletableLocalKeys = async (existingKeys, desiredKeys, keyToLocalPath) => {
     const deletableKeys = [];
     const scheduledLocalPaths = new Set();
     const isWindows = process.platform === "win32";
@@ -313,71 +263,18 @@ const collectDeletableLocalKeys = async (existingKeys, desiredKeys, keyToLocalPa
     }
     return deletableKeys;
 };
-const reconcileMaterializedDirectoryPath = async (entry, desiredKeys, desiredNodes, config, reporter, fileMode) => {
-    const desiredRootKey = buildDirectoryKey(entry.repoPath);
-    const desiredRootExists = desiredKeys.has(desiredRootKey);
-    if (desiredRootExists) {
-        await ensureMaterializedDirectoryPath(entry.localPath, fileMode);
-    }
-    const desiredDirectoryKeys = desiredRootExists
-        ? buildDesiredDirectoryKeys(entry, desiredNodes)
-        : new Set();
-    await limitConcurrency(CONSTANTS.SYNC.DEFAULT_CONCURRENCY, [...desiredDirectoryKeys].sort((left, right) => {
-        return left.localeCompare(right);
-    }), async (directoryKey) => {
-        if (directoryKey === desiredRootKey) {
-            return;
-        }
-        const relativePath = directoryKey.slice(entry.repoPath.length + 1, -1);
-        await ensureMaterializedDirectoryPath(join(entry.localPath, ...relativePath.split("/")), fileMode);
-    });
-    let processedNodeCount = 0;
-    await limitConcurrency(CONSTANTS.SYNC.DEFAULT_CONCURRENCY, [...desiredNodes.keys()].sort((left, right) => {
-        return left.localeCompare(right);
-    }), async (relativePath) => {
-        const node = desiredNodes.get(relativePath);
-        if (node === undefined) {
-            return;
-        }
-        const targetNodePath = join(entry.localPath, ...relativePath.split("/"));
-        if (await isMaterializedFileLikeNodeCurrent(targetNodePath, node, fileMode)) {
-            return;
-        }
-        await stageAndReplaceFilePath(targetNodePath, node, reporter, fileMode);
-        processedNodeCount += 1;
-        if ((reporter?.level ?? 0) >= 4) {
-            reporter?.verbose(`updated local node ${posix.join(entry.repoPath, relativePath)}`);
-        }
-        else if (processedNodeCount % 100 === 0) {
-            reporter?.start(`Updated ${processedNodeCount} local nodes for ${entry.repoPath}...`);
-        }
-    });
-    const existingKeys = new Set();
-    const keyToLocalPath = new Map();
-    await countDeletedLocalNodes(entry, desiredKeys, config, existingKeys, reporter, keyToLocalPath);
-    const deletableKeys = await collectDeletableLocalKeys(existingKeys, desiredKeys, keyToLocalPath);
-    for (const key of deletableKeys) {
-        const localPath = keyToLocalPath.get(key);
-        if (localPath === undefined) {
-            continue;
-        }
-        await removePathAtomically(localPath);
-        reporter?.verbose(`removed stale local path ${key}`);
-    }
-};
-export const countDeletedLocalNodes = async (entry, desiredKeys, config, existingKeys = new Set(), reporter, keyToLocalPath, deletedKeys) => {
+export const countDeletedLocalNodes = async (entry, desiredKeys, config, existingKeys = new Set(), keyToLocalPath, deletedKeys) => {
     const rule = resolveSyncRule(config, entry.repoPath, config.activeProfile);
     if (rule === undefined || rule.mode === "ignore") {
         return 0;
     }
-    const progressState = { scannedLocalNodeCount: 0 };
     const childEntryPaths = entry.kind === "directory"
         ? collectChildEntryPaths(config, entry.repoPath)
         : new Set();
     const rootStats = entry.kind === "directory"
         ? await getFollowedPathStats(entry.localPath)
         : await getPathStats(entry.localPath);
-    await collectLocalLeafKeys(entry.localPath, entry.repoPath, existingKeys, keyToLocalPath, childEntryPaths, undefined, reporter, progressState, rootStats);
+    await collectLocalLeafKeys(entry.localPath, entry.repoPath, existingKeys, keyToLocalPath, childEntryPaths, undefined, rootStats);
     const deletableKeys = await collectDeletableLocalKeys(existingKeys, desiredKeys, keyToLocalPath ?? new Map());
     for (const key of deletableKeys) {
         deletedKeys?.add(key);
@@ -392,7 +289,7 @@ export const collectChangedLocalPaths = async (entry, materialization, config) =
         const existingKeys = new Set();
         const keyToLocalPath = new Map();
         const deletedKeys = new Set();
-        await countDeletedLocalNodes(entry, materialization.desiredKeys, config, existingKeys, undefined, keyToLocalPath, deletedKeys);
+        await countDeletedLocalNodes(entry, materialization.desiredKeys, config, existingKeys, keyToLocalPath, deletedKeys);
         return [...deletedKeys]
             .map((key) => {
             return keyToLocalPath.get(key);
@@ -433,7 +330,7 @@ export const collectChangedLocalPaths = async (entry, materialization, config) =
         const existingKeys = new Set();
         const keyToLocalPath = new Map();
         const deletedKeys = new Set();
-        await countDeletedLocalNodes(entry, materialization.desiredKeys, config, existingKeys, undefined, keyToLocalPath, deletedKeys);
+        await countDeletedLocalNodes(entry, materialization.desiredKeys, config, existingKeys, keyToLocalPath, deletedKeys);
         for (const key of deletedKeys) {
             const localPath = keyToLocalPath.get(key);
             if (localPath !== undefined) {
@@ -445,25 +342,6 @@ export const collectChangedLocalPaths = async (entry, materialization, config) =
         return left.localeCompare(right);
     });
 };
-export const applyEntryMaterialization = async (entry, materialization, config, reporter) => {
-    const rule = resolveSyncRule(config, entry.repoPath, config.activeProfile);
-    if (rule === undefined || rule.mode === "ignore") {
-        return;
-    }
-    if (materialization.type === "absent") {
-        if (entry.kind === "directory") {
-            await reconcileMaterializedDirectoryPath(entry, materialization.desiredKeys, new Map(), config, reporter, entry.permission);
-            return;
-        }
-        await removePathAtomically(entry.localPath);
-        return;
-    }
-    if (materialization.type === "file") {
-        await stageAndReplaceFilePath(entry.localPath, materialization.node, reporter, entry.permission);
-        return;
-    }
-    await reconcileMaterializedDirectoryPath(entry, materialization.desiredKeys, materialization.nodes, config, reporter, entry.permission);
-};
 export const buildPullCounts = (materializations) => {
     let decryptedFileCount = 0;
     let directoryCount = 0;
@@ -508,4 +386,66 @@ export const buildPullCounts = (materializations) => {
         symlinkCount,
     };
 };
-//# sourceMappingURL=local-materialization.js.map
+const reconcileMaterializedDirectoryPath = async (entry, desiredKeys, desiredNodes, config, fileMode) => {
+    const desiredRootKey = buildDirectoryKey(entry.repoPath);
+    const desiredRootExists = desiredKeys.has(desiredRootKey);
+    if (desiredRootExists) {
+        await ensureMaterializedDirectoryPath(entry.localPath, fileMode);
+    }
+    const desiredDirectoryKeys = desiredRootExists
+        ? buildDesiredDirectoryKeys(entry, desiredNodes)
+        : new Set();
+    await limitConcurrency(AppConstants.SYNC.DEFAULT_CONCURRENCY, [...desiredDirectoryKeys].sort((left, right) => {
+        return left.localeCompare(right);
+    }), async (directoryKey) => {
+        if (directoryKey === desiredRootKey) {
+            return;
+        }
+        const relativePath = directoryKey.slice(entry.repoPath.length + 1, -1);
+        await ensureMaterializedDirectoryPath(join(entry.localPath, ...relativePath.split("/")), fileMode);
+    });
+    await limitConcurrency(AppConstants.SYNC.DEFAULT_CONCURRENCY, [...desiredNodes.keys()].sort((left, right) => {
+        return left.localeCompare(right);
+    }), async (relativePath) => {
+        const node = desiredNodes.get(relativePath);
+        if (node === undefined) {
+            return;
+        }
+        const targetNodePath = join(entry.localPath, ...relativePath.split("/"));
+        if (await isMaterializedFileLikeNodeCurrent(targetNodePath, node, fileMode)) {
+            return;
+        }
+        await stageAndReplacePath(targetNodePath, node, fileMode);
+    });
+    const existingKeys = new Set();
+    const keyToLocalPath = new Map();
+    await countDeletedLocalNodes(entry, desiredKeys, config, existingKeys, keyToLocalPath);
+    const deletableKeys = await collectDeletableLocalKeys(existingKeys, desiredKeys, keyToLocalPath);
+    for (const key of deletableKeys) {
+        const localPath = keyToLocalPath.get(key);
+        if (localPath === undefined) {
+            continue;
+        }
+        await removePathAtomically(localPath);
+    }
+};
+export const applyEntryMaterialization = async (entry, materialization, config) => {
+    const rule = resolveSyncRule(config, entry.repoPath, config.activeProfile);
+    if (rule === undefined || rule.mode === "ignore") {
+        return;
+    }
+    if (materialization.type === "absent") {
+        if (entry.kind === "directory") {
+            await reconcileMaterializedDirectoryPath(entry, materialization.desiredKeys, new Map(), config, entry.permission);
+            return;
+        }
+        await removePathAtomically(entry.localPath);
+        return;
+    }
+    if (materialization.type === "file") {
+        await stageAndReplacePath(entry.localPath, materialization.node, entry.permission);
+        return;
+    }
+    await reconcileMaterializedDirectoryPath(entry, materialization.desiredKeys, materialization.nodes, config, entry.permission);
+};
+//# sourceMappingURL=pull-apply.js.map

package/dist/services/pull-apply.js.map

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

package/dist/services/pull.d.ts

@@ -1,19 +1,16 @@
-import type { ConsolaInstance } from "consola";
-import { buildPullCounts, type EntryMaterialization } from "./local-materialization.ts";
-import { type EffectiveSyncConfig } from "./runtime.ts";
+import { buildPullCounts, type EntryMaterialization } from "./pull-apply.ts";
+import { type EffectiveSyncConfig } from "./sync-context.ts";
 export type PullRequest = Readonly<{
     dryRun: boolean;
     profile?: string;
 }>;
 export type PullResult = Readonly<{
-    configPath: string;
     decryptedFileCount: number;
     deletedLocalCount: number;
     directoryCount: number;
     dryRun: boolean;
     plainFileCount: number;
     symlinkCount: number;
-    syncDirectory: string;
 }>;
 export type PullPlan = Readonly<{
     counts: ReturnType<typeof buildPullCounts>;
@@ -29,10 +26,10 @@ export type PreparedPull = Readonly<{
     plan: PullPlan;
     syncDirectory: string;
 }>;
-export declare const buildPullPlan: (config: EffectiveSyncConfig, syncDirectory: string, reporter?: ConsolaInstance) => Promise<PullPlan>;
+export declare const buildPullPlan: (config: EffectiveSyncConfig, syncDirectory: string) => Promise<PullPlan>;
 export declare const buildPullPlanPreview: (plan: PullPlan) => string[];
-export declare const buildPullResultFromPlan: (plan: PullPlan, syncDirectory: string, dryRun: boolean) => PullResult;
-export declare const pullChanges: (request: PullRequest, reporter?: ConsolaInstance) => Promise<PullResult>;
-export declare const preparePull: (request: PullRequest, reporter?: ConsolaInstance) => Promise<PreparedPull>;
-export declare const applyPullPlan: (config: EffectiveSyncConfig, plan: PullPlan, reporter?: ConsolaInstance) => Promise<void>;
+export declare const buildPullResultFromPlan: (plan: PullPlan, dryRun: boolean) => PullResult;
+export declare const pullChanges: (request: PullRequest) => Promise<PullResult>;
+export declare const preparePull: (request: PullRequest) => Promise<PreparedPull>;
+export declare const applyPullPlan: (config: EffectiveSyncConfig, plan: PullPlan) => Promise<void>;
 //# sourceMappingURL=pull.d.ts.map

package/dist/services/pull.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/services/pull.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAM/C,OAAO,EAGL,eAAe,EAGf,KAAK,oBAAoB,EAC1B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,KAAK,mBAAmB,EAGzB,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC;IACjC,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAEH,MAAM,MAAM,QAAQ,GAAG,QAAQ,CAAC;IAC9B,MAAM,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;IAC3C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,gBAAgB,EAAE,SAAS,CAAC,oBAAoB,GAAG,SAAS,CAAC,EAAE,CAAC;IAChE,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;CACtC,CAAC,CAAC;AAEH,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC;IAClC,MAAM,EAAE,mBAAmB,CAAC;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAoEH,eAAO,MAAM,aAAa,GACxB,QAAQ,mBAAmB,EAC3B,eAAe,MAAM,EACrB,WAAW,eAAe,KACzB,OAAO,CAAC,QAAQ,CA0ElB,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,MAAM,QAAQ,aAKlD,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,MAAM,QAAQ,EACd,eAAe,MAAM,EACrB,QAAQ,OAAO,KACd,UASF,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,SAAS,WAAW,EACpB,WAAW,eAAe,KACzB,OAAO,CAAC,UAAU,CAYpB,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,SAAS,WAAW,EACpB,WAAW,eAAe,KACzB,OAAO,CAAC,YAAY,CAkBtB,CAAC;AA6CF,eAAO,MAAM,aAAa,GACxB,QAAQ,mBAAmB,EAC3B,MAAM,QAAQ,EACd,WAAW,eAAe,kBAwB3B,CAAC"}
+{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/services/pull.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,eAAe,EAGf,KAAK,oBAAoB,EAC1B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,KAAK,mBAAmB,EAGzB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC;IACjC,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC,CAAC;AAEH,MAAM,MAAM,QAAQ,GAAG,QAAQ,CAAC;IAC9B,MAAM,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;IAC3C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,gBAAgB,EAAE,SAAS,CAAC,oBAAoB,GAAG,SAAS,CAAC,EAAE,CAAC;IAChE,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;CACtC,CAAC,CAAC;AAEH,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC;IAClC,MAAM,EAAE,mBAAmB,CAAC;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAoEH,eAAO,MAAM,aAAa,GACxB,QAAQ,mBAAmB,EAC3B,eAAe,MAAM,KACpB,OAAO,CAAC,QAAQ,CAkElB,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,MAAM,QAAQ,aAKlD,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,MAAM,QAAQ,EACd,QAAQ,OAAO,KACd,UAMF,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,SAAS,WAAW,KACnB,OAAO,CAAC,UAAU,CAQpB,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,SAAS,WAAW,KACnB,OAAO,CAAC,YAAY,CAetB,CAAC;AA6CF,eAAO,MAAM,aAAa,GACxB,QAAQ,mBAAmB,EAC3B,MAAM,QAAQ,kBAkBf,CAAC"}