devchain-cli 0.24.1 → 0.25.0

package/dist/server/modules/file-sync/file-sync-conflicts.d.ts

@@ -0,0 +1,3 @@
+import { type ConflictBaseline, type ConflictReport } from './file-sync.dto';
+export declare function captureFileSyncConflictBaseline(root: string, ignores: readonly string[], signal?: AbortSignal): Promise<ConflictBaseline>;
+export declare function scanFileSyncConflicts(root: string, baseline: ConflictBaseline, ignores: readonly string[], signal?: AbortSignal): Promise<ConflictReport>;

package/dist/server/modules/file-sync/file-sync-conflicts.js

@@ -0,0 +1,191 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.captureFileSyncConflictBaseline = captureFileSyncConflictBaseline;
+exports.scanFileSyncConflicts = scanFileSyncConflicts;
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const file_sync_dto_1 = require("./file-sync.dto");
+async function ignoreRules(root, patterns) {
+    const rules = [];
+    const loaded = new Set();
+    const parse = async (lines, directory) => {
+        let escape = process.platform === 'win32' ? '|' : '\\';
+        for (let pattern of lines) {
+            pattern = pattern.trim();
+            if (!pattern || pattern.startsWith('//'))
+                continue;
+            if (pattern.startsWith('#escape=')) {
+                escape = pattern.slice(8);
+                continue;
+            }
+            if (pattern.startsWith('#include ')) {
+                const path = (0, node_path_1.resolve)(directory, pattern.slice(9).trim());
+                if (loaded.has(path))
+                    throw new Error('An ignore file was included more than once.');
+                loaded.add(path);
+                await parse((await (0, promises_1.readFile)(path, 'utf8')).split(/\r?\n/), (0, node_path_1.dirname)(path));
+                continue;
+            }
+            let include = false;
+            let insensitive = process.platform === 'win32' || process.platform === 'darwin';
+            while (pattern.startsWith('!') || /^\(\?[id]\)/.test(pattern)) {
+                if (pattern.startsWith('!')) {
+                    include = true;
+                    pattern = pattern.slice(1);
+                }
+                else {
+                    if (pattern.startsWith('(?i)'))
+                        insensitive = true;
+                    pattern = pattern.slice(4);
+                }
+            }
+            const rooted = pattern.startsWith('/');
+            const body = rooted ? pattern.slice(1) : pattern;
+            const source = globSource(body, escape);
+            rules.push({
+                include,
+                base: include && rooted ? literalBase(body, escape, insensitive) : null,
+                match: new RegExp(`${rooted ? '^' : '(?:^|/)'}${source}${pattern.endsWith('/') ? '' : '(?:$|/)'}`, insensitive ? 'i' : ''),
+            });
+        }
+    };
+    await parse(patterns, root);
+    return rules;
+}
+function literalBase(body, escape, insensitive) {
+    const segments = [];
+    let segment = '';
+    for (let i = 0; i < body.length; i += 1) {
+        const char = body[i];
+        if (char === escape && i + 1 < body.length)
+            segment += body[++i];
+        else if ('*?[{'.includes(char))
+            return { path: segments.join('/'), exact: false, insensitive };
+        else if (char === '/') {
+            segments.push(segment);
+            segment = '';
+        }
+        else
+            segment += char;
+    }
+    if (segment)
+        segments.push(segment);
+    return { path: segments.join('/'), exact: true, insensitive };
+}
+function reachesInside(rule, name) {
+    if (!rule.base)
+        return true;
+    const fold = (value) => (rule.base?.insensitive ? value.toLowerCase() : value);
+    const path = fold(rule.base.path);
+    const folder = fold(name);
+    if (path.startsWith(`${folder}/`))
+        return true;
+    return !rule.base.exact && (path === '' || folder === path || folder.startsWith(`${path}/`));
+}
+function globSource(pattern, escape) {
+    const literal = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    let result = '';
+    let alternatives = 0;
+    for (let i = 0; i < pattern.length; i += 1) {
+        const char = pattern[i];
+        if (char === escape && i + 1 < pattern.length)
+            result += literal(pattern[++i]);
+        else if (char === '*') {
+            if (pattern[i + 1] === '*') {
+                i += 1;
+                if (pattern[i + 1] === '/') {
+                    i += 1;
+                    result += '(?:.*/)?';
+                }
+                else
+                    result += '.*';
+            }
+            else
+                result += '[^/]*';
+        }
+        else if (char === '?')
+            result += '[^/]';
+        else if (char === '[' && pattern.indexOf(']', i + 1) >= 0) {
+            const end = pattern.indexOf(']', i + 1);
+            result += pattern.slice(i, end + 1);
+            i = end;
+        }
+        else if (char === '{') {
+            alternatives += 1;
+            result += '(?:';
+        }
+        else if (char === '}' && alternatives > 0) {
+            alternatives -= 1;
+            result += ')';
+        }
+        else if (char === ',' && alternatives > 0)
+            result += '|';
+        else
+            result += literal(char);
+    }
+    return result;
+}
+async function walkConflicts(root, ignores, visit, signal) {
+    const rules = await ignoreRules(root, ignores);
+    const walk = async (path) => {
+        signal?.throwIfAborted();
+        const directory = await (0, promises_1.opendir)(path);
+        try {
+            for await (const entry of directory) {
+                signal?.throwIfAborted();
+                const conflictCopy = entry.isFile() && entry.name.includes('.sync-conflict-');
+                if (entry.isSymbolicLink() || (!entry.isDirectory() && !conflictCopy))
+                    continue;
+                const fullPath = (0, node_path_1.join)(path, entry.name);
+                const name = (0, node_path_1.relative)(root, fullPath).split(node_path_1.sep).join('/');
+                const matched = rules.findIndex((rule) => rule.match.test(name));
+                const ignored = matched >= 0 && !rules[matched].include;
+                if (entry.isDirectory()) {
+                    if (!ignored ||
+                        rules.slice(0, matched).some((rule) => rule.include && reachesInside(rule, name)))
+                        await walk(fullPath);
+                }
+                else if (!ignored) {
+                    visit(name);
+                }
+            }
+        }
+        finally {
+            await directory.close().catch(() => undefined);
+        }
+    };
+    await walk(root);
+}
+async function captureFileSyncConflictBaseline(root, ignores, signal) {
+    const paths = [];
+    let baselineOverCap = false;
+    await walkConflicts(root, ignores, (name) => {
+        if (baselineOverCap)
+            return;
+        if (paths.length === file_sync_dto_1.CONFLICT_BASELINE_MAX) {
+            baselineOverCap = true;
+            paths.length = 0;
+        }
+        else
+            paths.push(name);
+    }, signal);
+    return baselineOverCap ? { baselineOverCap: true } : { baselineOverCap: false, paths };
+}
+async function scanFileSyncConflicts(root, baseline, ignores, signal) {
+    const previous = new Set(baseline.baselineOverCap ? [] : baseline.paths);
+    const result = {
+        total: 0,
+        sample: [],
+        ...(baseline.baselineOverCap && { baselineOverCap: true }),
+    };
+    await walkConflicts(root, ignores, (name) => {
+        if (previous.has(name))
+            return;
+        result.total += 1;
+        if (result.sample.length < file_sync_dto_1.FILE_SYNC_REPORT_SAMPLE)
+            result.sample.push(name);
+    }, signal);
+    result.sample.sort();
+    return result;
+}
+//# sourceMappingURL=file-sync-conflicts.js.map

package/dist/server/modules/file-sync/file-sync-conflicts.js.map

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

package/dist/server/modules/file-sync/file-sync-ignores.store.d.ts

@@ -3,8 +3,12 @@ import { DEFAULT_FILE_SYNC_IGNORES } from './file-sync.dto';
 export { DEFAULT_FILE_SYNC_IGNORES };
 export declare class FileSyncIgnoresStore {
     private readonly sqlite;
+    private readonly transactions;
     constructor(db: BetterSQLite3Database);
     get(projectId: string): string[];
-    set(projectId: string, ignores: string[] | null): string[];
+    set(projectId: string, ignores: string[] | null, expectedRevision?: number): string[];
+    revision(projectId: string): number;
+    private readRevisions;
+    private write;
     private readMap;
 }

package/dist/server/modules/file-sync/file-sync-ignores.store.js

@@ -14,34 +14,65 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileSyncIgnoresStore = exports.DEFAULT_FILE_SYNC_IGNORES = void 0;
 const common_1 = require("@nestjs/common");
+const zod_1 = require("zod");
 const logger_1 = require("../../common/logging/logger");
 const db_provider_1 = require("../storage/db/db.provider");
 const sqlite_raw_1 = require("../storage/db/sqlite-raw");
+const transaction_runner_1 = require("../storage/db/transaction-runner");
+const error_types_1 = require("../../common/errors/error-types");
 const file_sync_dto_1 = require("./file-sync.dto");
 Object.defineProperty(exports, "DEFAULT_FILE_SYNC_IGNORES", { enumerable: true, get: function () { return file_sync_dto_1.DEFAULT_FILE_SYNC_IGNORES; } });
 const logger = (0, logger_1.createLogger)('FileSyncIgnoresStore');
 const SETTINGS_KEY = 'fileSync.ignores';
+const REVISIONS_KEY = 'fileSync.ignoreRevisions';
 let FileSyncIgnoresStore = class FileSyncIgnoresStore {
     sqlite;
+    transactions;
     constructor(db) {
         this.sqlite = (0, sqlite_raw_1.getRawSqliteClient)(db);
+        this.transactions = new transaction_runner_1.TransactionRunner(this.sqlite);
     }
     get(projectId) {
         return this.readMap()[projectId] ?? [...file_sync_dto_1.DEFAULT_FILE_SYNC_IGNORES];
     }
-    set(projectId, ignores) {
-        const map = this.readMap();
-        if (ignores === null)
-            delete map[projectId];
-        else
-            map[projectId] = file_sync_dto_1.IgnorePatternsSchema.parse(ignores);
+    set(projectId, ignores, expectedRevision) {
+        const validated = ignores === null ? null : file_sync_dto_1.IgnorePatternsSchema.parse(ignores);
+        return this.transactions.runImmediate(() => {
+            const revisions = this.readRevisions();
+            const revision = revisions[projectId] ?? 0;
+            if (expectedRevision !== undefined && expectedRevision !== revision)
+                throw new error_types_1.AppError('The file list changed. Review it again.', file_sync_dto_1.FILE_SYNC_IGNORES_CHANGED, 409);
+            const map = this.readMap();
+            if (validated === null)
+                delete map[projectId];
+            else
+                map[projectId] = validated;
+            revisions[projectId] = revision + 1;
+            this.write(SETTINGS_KEY, map);
+            this.write(REVISIONS_KEY, revisions);
+            return this.get(projectId);
+        });
+    }
+    revision(projectId) {
+        return this.readRevisions()[projectId] ?? 0;
+    }
+    readRevisions() {
+        const row = this.sqlite
+            .prepare('SELECT value FROM settings WHERE key = ?')
+            .get(REVISIONS_KEY);
+        if (!row)
+            return {};
+        return zod_1.z
+            .record(zod_1.z.number().int().nonnegative().max(Number.MAX_SAFE_INTEGER))
+            .parse(JSON.parse(row.value));
+    }
+    write(key, value) {
         const now = new Date().toISOString();
         this.sqlite
             .prepare(`INSERT INTO settings (id, key, value, created_at, updated_at)
          VALUES (lower(hex(randomblob(16))), ?, ?, ?, ?)
          ON CONFLICT(key) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at`)
-            .run(SETTINGS_KEY, JSON.stringify(map), now, now);
-        return this.get(projectId);
+            .run(key, JSON.stringify(value), now, now);
     }
     readMap() {
         const row = this.sqlite

package/dist/server/modules/file-sync/file-sync-ignores.store.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-sync-ignores.store.js","sourceRoot":"","sources":["../../../src/modules/file-sync/file-sync-ignores.store.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AAGpD,wDAA2D;AAC3D,2DAA0D;AAC1D,yDAA8D;AAC9D,mDAAkF;AAOzE,0GAPA,yCAAyB,OAOA;AALlC,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,sBAAsB,CAAC,CAAC;AAGpD,MAAM,YAAY,GAAG,kBAAkB,CAAC;AAKjC,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IACd,MAAM,CAAoB;IAE3C,YAAmC,EAAyB;QAC1D,IAAI,CAAC,MAAM,GAAG,IAAA,+BAAkB,EAAC,EAAE,CAAC,CAAC;IACvC,CAAC;IAGD,GAAG,CAAC,SAAiB;QACnB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,yCAAyB,CAAC,CAAC;IACrE,CAAC;IAGD,GAAG,CAAC,SAAiB,EAAE,OAAwB;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;;YACvC,GAAG,CAAC,SAAS,CAAC,GAAG,oCAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM;aACR,OAAO,CACN;;iGAEyF,CAC1F;aACA,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC7B,CAAC;IAEO,OAAO;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM;aACpB,OAAO,CAAC,0CAA0C,CAAC;aACnD,GAAG,CAAC,YAAY,CAAkC,CAAC;QACtD,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAA4B,CAAC;YAChE,MAAM,GAAG,GAA6B,EAAE,CAAC;YACzC,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBACxD,MAAM,OAAO,GAAG,oCAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;gBACtD,IAAI,OAAO,CAAC,OAAO;oBAAE,GAAG,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YACrD,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,IAAI,CAAC,kEAAkE,CAAC,CAAC;YAChF,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;CACF,CAAA;AA9CY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAIE,WAAA,IAAA,eAAM,EAAC,2BAAa,CAAC,CAAA;;GAHvB,oBAAoB,CA8ChC"}
+{"version":3,"file":"file-sync-ignores.store.js","sourceRoot":"","sources":["../../../src/modules/file-sync/file-sync-ignores.store.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/file-sync/file-sync.controller.d.ts

@@ -7,8 +7,6 @@ export declare class FileSyncController {
     }>;
     get(projectId: string): {
         ignores: string[];
-    };
-    put(projectId: string, body: unknown): {
-        ignores: string[];
+        revision: number;
     };
 }

package/dist/server/modules/file-sync/file-sync.controller.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileSyncController = void 0;
 const common_1 = require("@nestjs/common");
 const zod_1 = require("zod");
-const file_sync_dto_1 = require("./file-sync.dto");
 const file_sync_service_1 = require("./file-sync.service");
 const ProjectIdSchema = zod_1.z.string().trim().min(1).max(128);
 let FileSyncController = class FileSyncController {
@@ -27,11 +26,11 @@ let FileSyncController = class FileSyncController {
         return { folders: await this.fileSync.projectNeed(ProjectIdSchema.parse(projectId)) };
     }
     get(projectId) {
-        return { ignores: this.fileSync.getIgnores(ProjectIdSchema.parse(projectId)) };
-    }
-    put(projectId, body) {
-        const { ignores } = file_sync_dto_1.IgnoresBodySchema.parse(body);
-        return { ignores: this.fileSync.setIgnores(ProjectIdSchema.parse(projectId), ignores) };
+        const id = ProjectIdSchema.parse(projectId);
+        return {
+            ignores: this.fileSync.getIgnores(id),
+            revision: this.fileSync.getIgnoresRevision(id),
+        };
     }
 };
 exports.FileSyncController = FileSyncController;
@@ -49,14 +48,6 @@ __decorate([
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Object)
 ], FileSyncController.prototype, "get", null);
-__decorate([
-    (0, common_1.Put)('ignores'),
-    __param(0, (0, common_1.Param)('projectId')),
-    __param(1, (0, common_1.Body)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object]),
-    __metadata("design:returntype", Object)
-], FileSyncController.prototype, "put", null);
 exports.FileSyncController = FileSyncController = __decorate([
     (0, common_1.Controller)('api/file-sync/projects/:projectId'),
     __metadata("design:paramtypes", [file_sync_service_1.FileSyncService])

package/dist/server/modules/file-sync/file-sync.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-sync.controller.js","sourceRoot":"","sources":["../../../src/modules/file-sync/file-sync.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmE;AACnE,6BAAwB;AACxB,mDAAoD;AACpD,2DAAuE;AAEvE,MAAM,eAAe,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAInD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IACA;IAA7B,YAA6B,QAAyB;QAAzB,aAAQ,GAAR,QAAQ,CAAiB;IAAG,CAAC;IAIpD,AAAN,KAAK,CAAC,MAAM,CAAqB,SAAiB;QAChD,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;IACxF,CAAC;IAID,GAAG,CAAqB,SAAiB;QACvC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;IACjF,CAAC;IAGD,GAAG,CAAqB,SAAiB,EAAU,IAAa;QAC9D,MAAM,EAAE,OAAO,EAAE,GAAG,iCAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClD,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC;IAC1F,CAAC;CACF,CAAA;AApBY,gDAAkB;AAKvB;IADL,IAAA,YAAG,EAAC,QAAQ,CAAC;IACA,WAAA,IAAA,cAAK,EAAC,WAAW,CAAC,CAAA;;;;gDAE/B;AAID;IADC,IAAA,YAAG,EAAC,SAAS,CAAC;IACV,WAAA,IAAA,cAAK,EAAC,WAAW,CAAC,CAAA;;;;6CAEtB;AAGD;IADC,IAAA,YAAG,EAAC,SAAS,CAAC;IACV,WAAA,IAAA,cAAK,EAAC,WAAW,CAAC,CAAA;IAAqB,WAAA,IAAA,aAAI,GAAE,CAAA;;;;6CAGjD;6BAnBU,kBAAkB;IAD9B,IAAA,mBAAU,EAAC,mCAAmC,CAAC;qCAEP,mCAAe;GAD3C,kBAAkB,CAoB9B"}
+{"version":3,"file":"file-sync.controller.js","sourceRoot":"","sources":["../../../src/modules/file-sync/file-sync.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwD;AACxD,6BAAwB;AACxB,2DAAuE;AAEvE,MAAM,eAAe,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAInD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IACA;IAA7B,YAA6B,QAAyB;QAAzB,aAAQ,GAAR,QAAQ,CAAiB;IAAG,CAAC;IAIpD,AAAN,KAAK,CAAC,MAAM,CAAqB,SAAiB;QAChD,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;IACxF,CAAC;IAID,GAAG,CAAqB,SAAiB;QACvC,MAAM,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC5C,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACrC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;SAC/C,CAAC;IACJ,CAAC;CACF,CAAA;AAlBY,gDAAkB;AAKvB;IADL,IAAA,YAAG,EAAC,QAAQ,CAAC;IACA,WAAA,IAAA,cAAK,EAAC,WAAW,CAAC,CAAA;;;;gDAE/B;AAID;IADC,IAAA,YAAG,EAAC,SAAS,CAAC;IACV,WAAA,IAAA,cAAK,EAAC,WAAW,CAAC,CAAA;;;;6CAMtB;6BAjBU,kBAAkB;IAD9B,IAAA,mBAAU,EAAC,mCAAmC,CAAC;qCAEP,mCAAe;GAD3C,kBAAkB,CAkB9B"}