devchain-cli 0.24.1 → 0.24.2

package/dist/server/modules/file-sync/sync-path-inspection.dto.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EXCLUSION_LIMIT_ERROR = exports.exclusionGroupKey = exports.SyncPathInspectionSchema = exports.SyncPatternChecksSchema = exports.SYNC_PATTERN_KEPT_SAMPLE_MAX = exports.SYNC_PATTERN_TRACKED_FILES_MAX = exports.within = exports.SyncPathFactsSchema = exports.SyncIgnoreRuleSchema = exports.SyncPathOwnerSchema = exports.SyncSuggestionsRequestSchema = exports.SyncInspectRequestSchema = exports.SyncRelativePathSchema = void 0;
+exports.ancestors = ancestors;
+exports.isSelectableExclusion = isSelectableExclusion;
+exports.isGiveOwnershipEligible = isGiveOwnershipEligible;
+const zod_1 = require("zod");
+const file_sync_dto_1 = require("./file-sync.dto");
+const absolute = (path) => /^(?:\/|[A-Za-z]:[\\/])/.test(path);
+exports.SyncRelativePathSchema = zod_1.z
+    .string()
+    .min(1)
+    .max(4096)
+    .refine((path) => !absolute(path) &&
+    !/[\\\x00\r\n]/.test(path) &&
+    path.split('/').every((part) => part !== '' && part !== '.' && part !== '..'), 'Expected a relative project path without traversal');
+exports.SyncInspectRequestSchema = zod_1.z
+    .object({
+    path: zod_1.z
+        .string()
+        .min(1)
+        .max(4096)
+        .refine((path) => absolute(path) && !path.includes('\0'), 'Expected an absolute project root'),
+    scan: zod_1.z.boolean(),
+    paths: zod_1.z.array(exports.SyncRelativePathSchema),
+    patterns: file_sync_dto_1.IgnorePatternsSchema.optional(),
+})
+    .strict();
+exports.SyncSuggestionsRequestSchema = zod_1.z.object({ remoteId: zod_1.z.string().uuid() }).strict();
+exports.SyncPathOwnerSchema = zod_1.z.object({
+    uid: zod_1.z.number().int().nonnegative(),
+    name: zod_1.z.string(),
+});
+exports.SyncIgnoreRuleSchema = zod_1.z.object({
+    source: zod_1.z.string(),
+    line: zod_1.z.number().int(),
+    pattern: zod_1.z.string(),
+});
+exports.SyncPathFactsSchema = zod_1.z.object({
+    path: exports.SyncRelativePathSchema,
+    kind: zod_1.z.enum(['file', 'folder', 'missing']),
+    owner: exports.SyncPathOwnerSchema,
+    foreignOwner: zod_1.z.boolean(),
+    foreignOwners: zod_1.z.array(exports.SyncPathOwnerSchema),
+    fileCount: zod_1.z.number().int().nonnegative(),
+    ignored: zod_1.z.boolean().nullable(),
+    ignoreRule: exports.SyncIgnoreRuleSchema.nullable(),
+    ignoreRules: zod_1.z.array(exports.SyncIgnoreRuleSchema),
+    ignoredAncestor: exports.SyncRelativePathSchema.nullable(),
+    tracked: zod_1.z.boolean().nullable(),
+    trackedDescendants: zod_1.z.array(exports.SyncRelativePathSchema).nullable(),
+});
+const within = (child, parent) => child === parent || child.startsWith(parent + '/');
+exports.within = within;
+function ancestors(path) {
+    const parts = path.split('/');
+    return parts.slice(0, -1).map((_, index) => parts.slice(0, index + 1).join('/'));
+}
+exports.SYNC_PATTERN_TRACKED_FILES_MAX = 50;
+exports.SYNC_PATTERN_KEPT_SAMPLE_MAX = 5;
+exports.SyncPatternChecksSchema = zod_1.z.object({
+    state: zod_1.z.enum(['checked', 'no-root', 'no-repo', 'error']),
+    error: zod_1.z.string().optional(),
+    results: zod_1.z.array(zod_1.z.object({
+        pattern: zod_1.z.string(),
+        tracked: zod_1.z.object({
+            count: zod_1.z.number().int().nonnegative(),
+            files: zod_1.z.array(zod_1.z.string()).max(exports.SYNC_PATTERN_TRACKED_FILES_MAX),
+            complete: zod_1.z.boolean(),
+        }),
+        kept: zod_1.z.object({
+            count: zod_1.z.number().int().nonnegative(),
+            sample: zod_1.z.array(zod_1.z.string()).max(exports.SYNC_PATTERN_KEPT_SAMPLE_MAX),
+        }),
+    })),
+});
+exports.SyncPathInspectionSchema = zod_1.z.object({
+    rootPath: zod_1.z.string(),
+    exists: zod_1.z.boolean(),
+    repository: zod_1.z.boolean(),
+    projectOwner: exports.SyncPathOwnerSchema.nullable(),
+    vmUser: exports.SyncPathOwnerSchema.optional(),
+    gitState: zod_1.z.enum(['repo', 'no-repo', 'error']),
+    gitError: zod_1.z.string().optional(),
+    candidates: zod_1.z.array(exports.SyncRelativePathSchema),
+    requestedPaths: zod_1.z.array(exports.SyncRelativePathSchema),
+    hiddenPaths: zod_1.z.array(exports.SyncRelativePathSchema).optional(),
+    entries: zod_1.z.array(exports.SyncPathFactsSchema),
+    patternChecks: exports.SyncPatternChecksSchema.optional(),
+});
+const exclusionGroupKey = (group) => `${group.side}:${group.path}`;
+exports.exclusionGroupKey = exclusionGroupKey;
+exports.EXCLUSION_LIMIT_ERROR = 'These paths cannot fit within the remaining exclusion pattern limit.';
+function isSelectableExclusion(group) {
+    return (group.patterns.length > 0 &&
+        !group.blockedBy &&
+        !group.gitUnchecked &&
+        !group.chown &&
+        !group.patternError);
+}
+function isGiveOwnershipEligible(group) {
+    return (!group.gitUnchecked &&
+        !!group.vm &&
+        (group.vm.foreignOwner || group.vm.foreignOwners.length > 0) &&
+        group.vm.tracked === false &&
+        group.vm.ignored === false);
+}
+//# sourceMappingURL=sync-path-inspection.dto.js.map

package/dist/server/modules/file-sync/sync-path-inspection.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-path-inspection.dto.js","sourceRoot":"","sources":["../../../src/modules/file-sync/sync-path-inspection.dto.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/file-sync/sync-path-inspector.d.ts

@@ -0,0 +1,12 @@
+import * as fs from 'node:fs/promises';
+import { ProcessExecutor } from '../terminal/services/process-executor/process-executor.port';
+import { type SyncPathInspection } from './sync-path-inspection.dto';
+export declare const SYNC_PATH_FILESYSTEM: unique symbol;
+type Filesystem = Pick<typeof fs, 'lstat' | 'readFile' | 'readdir'>;
+export declare class SyncPathInspector {
+    private readonly executor;
+    private readonly files;
+    constructor(executor: ProcessExecutor, files?: Filesystem);
+    inspect(root: string, scan: boolean, paths?: readonly string[], patterns?: readonly string[]): Promise<SyncPathInspection>;
+}
+export {};

package/dist/server/modules/file-sync/sync-path-inspector.js

@@ -0,0 +1,413 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SyncPathInspector = exports.SYNC_PATH_FILESYSTEM = void 0;
+const common_1 = require("@nestjs/common");
+const fs = __importStar(require("node:fs/promises"));
+const node_path_1 = require("node:path");
+const project_repository_1 = require("./project-repository");
+const error_types_1 = require("../../common/errors/error-types");
+const syncthing_markers_1 = require("../../common/constants/syncthing-markers");
+const process_executor_port_1 = require("../terminal/services/process-executor/process-executor.port");
+const ignore_pattern_matcher_1 = require("./ignore-pattern-matcher");
+const translate_git_ignore_rule_1 = require("./translate-git-ignore-rule");
+const sync_path_inspection_dto_1 = require("./sync-path-inspection.dto");
+exports.SYNC_PATH_FILESYSTEM = Symbol('SYNC_PATH_FILESYSTEM');
+const SYNC_INFO_EXCLUDES = new Set(syncthing_markers_1.SYNCTHING_GIT_EXCLUDES);
+function skipped(path) {
+    return path
+        .split('/')
+        .some((part) => ['.git', '.stfolder', '.stignore', '.stversions'].includes(part) ||
+        /^\.syncthing\..*\.tmp$/.test(part) ||
+        /^~syncthing~.*\.tmp$/.test(part));
+}
+function kindOf(info) {
+    if (!info)
+        return 'missing';
+    return info.isDirectory() ? 'folder' : 'file';
+}
+const ignores = (rule) => !!rule && !rule.pattern.startsWith('!');
+let SyncPathInspector = class SyncPathInspector {
+    executor;
+    files;
+    constructor(executor, files = fs) {
+        this.executor = executor;
+        this.files = files;
+    }
+    async inspect(root, scan, paths = [], patterns) {
+        if (!(0, node_path_1.isAbsolute)(root))
+            throw new error_types_1.ValidationError('The inspection root must be an absolute path.');
+        const request = sync_path_inspection_dto_1.SyncInspectRequestSchema.parse({ path: root, scan, paths, patterns });
+        root = (0, node_path_1.resolve)(request.path);
+        const stat = async (path) => this.files.lstat(path).catch((error) => {
+            if (error.code === 'ENOENT')
+                return null;
+            throw error;
+        });
+        const rootStat = await stat(root);
+        const result = {
+            rootPath: root,
+            exists: rootStat !== null,
+            repository: false,
+            projectOwner: null,
+            gitState: 'no-repo',
+            candidates: [],
+            requestedPaths: request.paths.filter((path) => !skipped(path)),
+            entries: [],
+            ...(request.patterns !== undefined && {
+                patternChecks: { state: rootStat ? 'no-repo' : 'no-root', results: [] },
+            }),
+        };
+        if (!rootStat)
+            return result;
+        if (!rootStat.isDirectory())
+            throw new error_types_1.ValidationError('The inspection root must be a folder, not a link.');
+        result.repository = (await (0, project_repository_1.projectRepository)(root)) === 'repository';
+        const names = new Map();
+        const passwd = await this.files.readFile('/etc/passwd', 'utf8').catch(() => '');
+        for (const line of passwd.split('\n')) {
+            const [name, , uid] = line.split(':');
+            if (name && /^\d+$/.test(uid ?? ''))
+                names.set(Number(uid), name);
+        }
+        const owner = (uid) => ({ uid, name: names.get(uid) ?? `uid ${uid}` });
+        result.projectOwner = owner(rootStat.uid);
+        const trees = new Map();
+        const tree = (name) => {
+            const found = trees.get(name);
+            if (found)
+                return found;
+            const read = async () => {
+                const info = await stat((0, node_path_1.join)(root, name));
+                const item = { stat: info, fileCount: 0, foreignUids: new Set(), children: [] };
+                if (!info || info.isSymbolicLink())
+                    return item;
+                if (info.uid !== rootStat.uid)
+                    item.foreignUids.add(info.uid);
+                if (info.isFile())
+                    item.fileCount = 1;
+                if (info.isDirectory()) {
+                    const children = await this.files
+                        .readdir((0, node_path_1.join)(root, name))
+                        .catch((error) => {
+                        if (error.code === 'EACCES' || error.code === 'EPERM')
+                            return [];
+                        throw error;
+                    });
+                    for (const child of children) {
+                        const childName = name ? `${name}/${child}` : child;
+                        if (skipped(childName))
+                            continue;
+                        const nested = await tree(childName);
+                        if (nested.stat?.isSymbolicLink())
+                            continue;
+                        item.children.push(childName);
+                        item.fileCount += nested.fileCount;
+                        for (const uid of nested.foreignUids)
+                            item.foreignUids.add(uid);
+                    }
+                }
+                return item;
+            };
+            const pending = read();
+            trees.set(name, pending);
+            return pending;
+        };
+        const checkLinks = async (name) => {
+            for (const part of [...(0, sync_path_inspection_dto_1.ancestors)(name), name]) {
+                if ((await stat((0, node_path_1.join)(root, part)))?.isSymbolicLink())
+                    throw new error_types_1.ValidationError('Inspected paths must not contain links.');
+            }
+        };
+        const given = [];
+        const hidden = [];
+        for (const name of result.requestedPaths) {
+            try {
+                await checkLinks(name);
+                given.push(name);
+            }
+            catch (error) {
+                const code = error.code;
+                if (code !== 'EACCES' && code !== 'EPERM')
+                    throw error;
+                hidden.push(name);
+            }
+        }
+        if (hidden.length)
+            result.hiddenPaths = hidden;
+        const gitDirectory = (await stat((0, node_path_1.join)(root, '.git')))?.isDirectory() ?? false;
+        const git = async (argv, input, noMatch = false) => {
+            const answer = await this.executor.run({
+                argv: ['git', ...argv],
+                cwd: root,
+                mode: 'pipe',
+                timeout: 10_000,
+                outputLimits: { maxBytes: 16 * 1024 * 1024 },
+                ...(input !== undefined && { input }),
+            });
+            if (answer.truncated ||
+                answer.timedOut ||
+                (!answer.success && !(noMatch && answer.exitCode === 1)))
+                throw new Error(answer.stderr.trim() || 'Git could not be checked.');
+            return answer.stdout;
+        };
+        let tracked = [];
+        let kept;
+        let hits = [];
+        const rules = new Map();
+        const gitFailed = (error) => {
+            result.gitState = 'error';
+            result.gitError = error instanceof Error ? error.message : 'Git could not be checked.';
+            if (request.patterns !== undefined)
+                result.patternChecks = { state: 'error', error: result.gitError, results: [] };
+            rules.clear();
+            tracked = [];
+        };
+        const topIgnored = (name) => (0, sync_path_inspection_dto_1.ancestors)(name).find((parent) => ignores(rules.get(parent))) ?? null;
+        if (gitDirectory) {
+            result.gitState = 'repo';
+            try {
+                tracked = (await git(['ls-files', '-z'])).split('\0').filter(Boolean);
+                if (request.patterns !== undefined)
+                    kept = (await git(['ls-files', '-z', '--others', '--exclude-standard']))
+                        .split('\0')
+                        .filter(Boolean);
+                if (scan) {
+                    const ignored = (await git([
+                        'ls-files',
+                        '-z',
+                        '--others',
+                        '--ignored',
+                        '--exclude-standard',
+                        '--directory',
+                    ]))
+                        .split('\0')
+                        .filter(Boolean)
+                        .map((name) => name.replace(/\/$/, ''));
+                    for (const name of ignored) {
+                        if (!sync_path_inspection_dto_1.SyncRelativePathSchema.safeParse(name).success || skipped(name))
+                            continue;
+                        try {
+                            await checkLinks(name);
+                        }
+                        catch (error) {
+                            if (error instanceof error_types_1.ValidationError)
+                                continue;
+                            throw error;
+                        }
+                        const item = await tree(name);
+                        if (item.foreignUids.size > 0)
+                            hits.push(name);
+                    }
+                }
+                const names = new Set([...given, ...hits].flatMap((name) => [...(0, sync_path_inspection_dto_1.ancestors)(name), name]));
+                const checks = [];
+                for (const name of names)
+                    checks.push((await stat((0, node_path_1.join)(root, name))) ? name : `${name}/`);
+                if (checks.length) {
+                    const output = (await git(['check-ignore', '-z', '-v', '--stdin'], checks.join('\0') + '\0', true)).split('\0');
+                    for (let i = 0; i + 3 < output.length; i += 4)
+                        rules.set(output[i + 3].replace(/\/$/, ''), {
+                            source: output[i],
+                            line: Number(output[i + 1]),
+                            pattern: output[i + 2],
+                        });
+                }
+                hits = hits.filter((name) => ignores(rules.get(name)));
+            }
+            catch (error) {
+                gitFailed(error);
+                hits = [];
+            }
+        }
+        if (scan && result.gitState !== 'repo') {
+            const discover = async (name) => {
+                const item = await tree(name);
+                if (name && item.stat && item.stat.uid !== rootStat.uid) {
+                    hits.push(name);
+                    return;
+                }
+                for (const child of item.children)
+                    await discover(child);
+            };
+            await discover('');
+        }
+        const trackedFiles = new Set(tracked);
+        const trackedBelow = new Map();
+        for (const file of tracked)
+            for (const parent of (0, sync_path_inspection_dto_1.ancestors)(file)) {
+                const files = trackedBelow.get(parent);
+                if (files)
+                    files.push(file);
+                else
+                    trackedBelow.set(parent, [file]);
+            }
+        const candidatePaths = hits.map((name) => topIgnored(name) ?? name);
+        result.candidates = [...new Set(candidatePaths)]
+            .sort()
+            .filter((name, _, all) => !all.some((parent) => parent !== name && (0, sync_path_inspection_dto_1.within)(name, parent)));
+        const inspected = new Set([...given, ...result.candidates]);
+        for (const name of given) {
+            for (const parent of (0, sync_path_inspection_dto_1.ancestors)(name))
+                inspected.add(parent);
+        }
+        const catalogue = new Map();
+        const sourceRules = (source) => {
+            const found = catalogue.get(source);
+            if (found)
+                return found;
+            const read = async () => {
+                const content = await this.files.readFile((0, node_path_1.join)(root, source), 'utf8').catch(() => '');
+                const entries = [];
+                for (const [index, line] of content.split(/\r?\n/).entries()) {
+                    const pattern = line.trim();
+                    if (!pattern ||
+                        pattern.startsWith('#') ||
+                        pattern.startsWith('!') ||
+                        (source === '.git/info/exclude' && SYNC_INFO_EXCLUDES.has(pattern)))
+                        continue;
+                    const rule = { source, line: index + 1, pattern };
+                    const translated = (0, translate_git_ignore_rule_1.translateGitIgnoreRule)(rule);
+                    if (translated)
+                        entries.push({ rule, patterns: translated.map(ignore_pattern_matcher_1.compileIgnorePattern) });
+                }
+                return entries;
+            };
+            const pending = read();
+            catalogue.set(source, pending);
+            return pending;
+        };
+        const matchingRules = async (name) => {
+            if (result.gitState !== 'repo')
+                return [];
+            const matches = [];
+            for (const source of [
+                '.gitignore',
+                ...(0, sync_path_inspection_dto_1.ancestors)(name).map((parent) => `${parent}/.gitignore`),
+                '.git/info/exclude',
+            ])
+                for (const entry of await sourceRules(source))
+                    if (entry.patterns.some((pattern) => pattern.kind === 'pattern' && pattern.matches(name)))
+                        matches.push(entry.rule);
+            return matches;
+        };
+        for (const name of [...inspected].sort()) {
+            const item = await tree(name);
+            let parentStat = item.stat;
+            if (!parentStat) {
+                for (let parent = (0, node_path_1.dirname)(name);; parent = (0, node_path_1.dirname)(parent)) {
+                    parentStat = await stat((0, node_path_1.join)(root, parent));
+                    if (parentStat?.isDirectory())
+                        break;
+                    if (parent === '.') {
+                        parentStat = rootStat;
+                        break;
+                    }
+                }
+            }
+            const rule = rules.get(name) ?? null;
+            result.entries.push({
+                path: name,
+                kind: kindOf(item.stat),
+                owner: owner(parentStat.uid),
+                foreignOwner: parentStat.uid !== rootStat.uid,
+                foreignOwners: [...item.foreignUids].map(owner),
+                fileCount: item.fileCount,
+                ignored: result.gitState === 'error' ? null : ignores(rule),
+                ignoreRule: rule,
+                ignoreRules: await matchingRules(name),
+                ignoredAncestor: topIgnored(name),
+                tracked: result.gitState === 'error' ? null : trackedFiles.has(name),
+                trackedDescendants: result.gitState === 'error' ? null : (trackedBelow.get(name) ?? []),
+            });
+        }
+        if (request.patterns !== undefined && result.gitState === 'repo') {
+            const compiled = request.patterns.map(ignore_pattern_matcher_1.compileIgnorePattern);
+            const unknown = compiled.find((pattern) => pattern.kind === 'error' || pattern.kind === 'include');
+            if (unknown) {
+                result.patternChecks = {
+                    state: 'error',
+                    error: unknown.kind === 'error' ? unknown.error : 'Included ignore files cannot be checked.',
+                    results: [],
+                };
+            }
+            else {
+                result.patternChecks = {
+                    state: 'checked',
+                    results: request.patterns.map((pattern, index) => {
+                        const rule = compiled[index];
+                        const matches = (file) => rule.kind === 'pattern' && rule.ignored && rule.matches(file);
+                        const trackedMatches = tracked.filter(matches);
+                        const keptMatches = kept.filter(matches);
+                        const complete = trackedMatches.length <= sync_path_inspection_dto_1.SYNC_PATTERN_TRACKED_FILES_MAX;
+                        return {
+                            pattern,
+                            tracked: {
+                                count: trackedMatches.length,
+                                files: complete ? trackedMatches : [],
+                                complete,
+                            },
+                            kept: {
+                                count: keptMatches.length,
+                                sample: keptMatches.slice(0, sync_path_inspection_dto_1.SYNC_PATTERN_KEPT_SAMPLE_MAX),
+                            },
+                        };
+                    }),
+                };
+            }
+        }
+        return result;
+    }
+};
+exports.SyncPathInspector = SyncPathInspector;
+exports.SyncPathInspector = SyncPathInspector = __decorate([
+    (0, common_1.Injectable)(),
+    __param(1, (0, common_1.Optional)()),
+    __param(1, (0, common_1.Inject)(exports.SYNC_PATH_FILESYSTEM)),
+    __metadata("design:paramtypes", [process_executor_port_1.ProcessExecutor, Object])
+], SyncPathInspector);
+//# sourceMappingURL=sync-path-inspector.js.map

package/dist/server/modules/file-sync/sync-path-inspector.js.map

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

package/dist/server/modules/file-sync/testing/fake-file-sync.service.d.ts

@@ -1,12 +1,13 @@
-import type { FolderSyncStatus, FolderType, SyncDevice, SyncFolder, SyncFolderPatch, SyncFolderRequest } from '../file-sync.dto';
+import type { FolderSyncStatus, RemoteNeed, ConflictReport, ConflictBaseline, FolderType, SyncDevice, SyncFolder, SyncFolderPatch, SyncFolderRequest, ForceCopyBackupRequest, ForceCopyBackup, ReceiveOnlyChanges, SyncStatusOptions } from '../file-sync.dto';
 import { FileSyncService, type FolderNeed, type ProjectFolder, type SyncProgress, type WaitForCompleteOptions } from '../file-sync.service';
 export interface FakeFolder {
     type: FolderType;
     paused: boolean;
     peerDeviceId: string;
     ignores: string[];
+    backupPath?: string;
 }
-export declare class FakeFileSyncService implements Pick<FileSyncService, 'device' | 'addPeer' | 'isConnected' | 'getIgnores' | 'setIgnores' | 'projectFolders' | 'initialFolders' | 'projectNeed' | 'ensureFolder' | 'updateFolder' | 'setFolderType' | 'folderConfiguration' | 'folderPath' | 'removeFolder' | 'status' | 'rescan' | 'revertLocalChanges' | 'waitForComplete'> {
+export declare class FakeFileSyncService implements Pick<FileSyncService, 'device' | 'addPeer' | 'isConnected' | 'getIgnores' | 'getIgnoresRevision' | 'setIgnores' | 'projectFolders' | 'initialFolders' | 'projectNeed' | 'ensureFolder' | 'forceCopyBackup' | 'localChanges' | 'override' | 'updateFolder' | 'setFolderType' | 'folderConfiguration' | 'folderPath' | 'removeFolder' | 'status' | 'remoteNeed' | 'conflicts' | 'conflictBaseline' | 'rescan' | 'revertLocalChanges' | 'waitForComplete'> {
     readonly deviceId: string;
     readonly peers: Set<string>;
     readonly gitProjects: Set<string>;
@@ -15,18 +16,35 @@ export declare class FakeFileSyncService implements Pick<FileSyncService, 'devic
         needItems: number;
         needBytes: number;
     }>;
+    readonly remoteNeeds: Map<string, {
+        deleted: number;
+        total: number;
+        sample: {
+            path: string;
+            deleted: boolean;
+        }[];
+        conflictPaths: string[];
+        conflictsOverCap: boolean;
+    }>;
+    readonly receiveOnlyChanges: Map<string, {
+        count: number;
+        sample: string[];
+    }>;
     readonly codeRoots: Map<string, string>;
     private readonly ignores;
+    private readonly revisions;
     ensureAvailable(): Promise<void>;
     device(): SyncDevice;
     addPeer(peer: SyncDevice): Promise<void>;
     isConnected(deviceId: string): Promise<boolean>;
     getIgnores(projectId: string): string[];
-    setIgnores(projectId: string, ignores: string[] | null): string[];
+    getIgnoresRevision(projectId: string): number;
+    setIgnores(projectId: string, ignores: string[] | null, revision?: number): string[];
     projectFolders(projectId: string): Promise<ProjectFolder[]>;
     initialFolders(projectId: string): Promise<ProjectFolder[]>;
     projectNeed(projectId: string): Promise<FolderNeed[] | null>;
     ensureFolder(request: SyncFolderRequest): Promise<SyncFolder>;
+    forceCopyBackup(request: ForceCopyBackupRequest): Promise<ForceCopyBackup>;
     updateFolder(folderId: string, patch: SyncFolderPatch): Promise<void>;
     folderConfiguration(folderId: string): Promise<{
         type: "sendonly" | "receiveonly" | "sendreceive";
@@ -38,9 +56,14 @@ export declare class FakeFileSyncService implements Pick<FileSyncService, 'devic
     folderPath(projectId: string, kind?: ProjectFolder['kind']): Promise<string>;
     setFolderType(folderId: string, type: FolderType): Promise<void>;
     removeFolder(folderId: string): Promise<void>;
-    status(folderId: string, peerDeviceId?: string): Promise<FolderSyncStatus>;
+    status(folderId: string, peerDeviceId?: string, _options?: SyncStatusOptions): Promise<FolderSyncStatus>;
     rescan(folderId: string, signal?: AbortSignal): Promise<void>;
+    remoteNeed(folderId: string, _peerDeviceId: string): Promise<RemoteNeed>;
+    conflicts(projectId: string, baseline: ConflictBaseline, ignores: readonly string[], signal?: AbortSignal): Promise<ConflictReport>;
+    conflictBaseline(projectId: string, ignores: readonly string[], signal?: AbortSignal): Promise<ConflictBaseline>;
     revertLocalChanges(folderId: string): Promise<void>;
+    localChanges(folderId: string): Promise<ReceiveOnlyChanges>;
+    override(folderId: string): Promise<void>;
     waitForComplete(folderId: string, options: WaitForCompleteOptions): Promise<SyncProgress>;
     private require;
 }