@codingame/monaco-vscode-user-data-sync-service-override 14.0.6 → 15.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-user-data-sync-service-override",
-  "version": "14.0.6",
+  "version": "15.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - user-data-sync service-override",
   "keywords": [],
@@ -15,19 +15,21 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-3607c442-ae7a-594b-b840-038378c24fef-common": "14.0.6",
-    "@codingame/monaco-vscode-407531d3-fdae-5387-8c41-49ba0e9574b5-common": "14.0.6",
-    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "14.0.6",
-    "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "14.0.6",
-    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "14.0.6",
-    "@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common": "14.0.6",
-    "@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common": "14.0.6",
-    "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common": "14.0.6",
-    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "14.0.6",
-    "@codingame/monaco-vscode-api": "14.0.6",
-    "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "14.0.6",
-    "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "14.0.6",
-    "@codingame/monaco-vscode-user-data-profile-service-override": "14.0.6"
+    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "15.0.0",
+    "@codingame/monaco-vscode-3607c442-ae7a-594b-b840-038378c24fef-common": "15.0.0",
+    "@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common": "15.0.0",
+    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "15.0.0",
+    "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "15.0.0",
+    "@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common": "15.0.0",
+    "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common": "15.0.0",
+    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "15.0.0",
+    "@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common": "15.0.0",
+    "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common": "15.0.0",
+    "@codingame/monaco-vscode-a4c2011e-8775-52bd-abf0-4a3c07a9696b-common": "15.0.0",
+    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "15.0.0",
+    "@codingame/monaco-vscode-api": "15.0.0",
+    "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "15.0.0",
+    "@codingame/monaco-vscode-user-data-profile-service-override": "15.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/userDataSync/common/promptsSync/promptsMerge.d.ts

@@ -0,0 +1,16 @@
+import { IStringDictionary } from "@codingame/monaco-vscode-api/vscode/vs/base/common/collections";
+export interface IMergeResult {
+    local: {
+        added: IStringDictionary<string>;
+        updated: IStringDictionary<string>;
+        removed: string[];
+    };
+    remote: {
+        added: IStringDictionary<string>;
+        updated: IStringDictionary<string>;
+        removed: string[];
+    };
+    conflicts: string[];
+}
+export declare function merge(local: IStringDictionary<string>, remote: IStringDictionary<string> | null, base: IStringDictionary<string> | null): IMergeResult;
+export declare function areSame(a: IStringDictionary<string>, b: IStringDictionary<string>): boolean;

package/vscode/src/vs/platform/userDataSync/common/promptsSync/promptsMerge.js

@@ -0,0 +1,128 @@
+
+
+function merge(local, remote, base) {
+    const localAdded = {};
+    const localUpdated = {};
+    const localRemoved = ( new Set());
+    if (!remote) {
+        return {
+            local: { added: localAdded, updated: localUpdated, removed: [...( localRemoved.values())] },
+            remote: { added: local, updated: {}, removed: [] },
+            conflicts: []
+        };
+    }
+    const localToRemote = compare(local, remote);
+    if (localToRemote.added.size === 0 && localToRemote.removed.size === 0 && localToRemote.updated.size === 0) {
+        return {
+            local: { added: localAdded, updated: localUpdated, removed: [...( localRemoved.values())] },
+            remote: { added: {}, updated: {}, removed: [] },
+            conflicts: []
+        };
+    }
+    const baseToLocal = compare(base, local);
+    const baseToRemote = compare(base, remote);
+    const remoteAdded = {};
+    const remoteUpdated = {};
+    const remoteRemoved = ( new Set());
+    const conflicts = ( new Set());
+    for (const key of ( baseToLocal.removed.values())) {
+        if (( baseToRemote.updated.has(key))) {
+            localAdded[key] = remote[key];
+        }
+        else {
+            remoteRemoved.add(key);
+        }
+    }
+    for (const key of ( baseToRemote.removed.values())) {
+        if (( conflicts.has(key))) {
+            continue;
+        }
+        if (( baseToLocal.updated.has(key))) {
+            conflicts.add(key);
+        }
+        else {
+            localRemoved.add(key);
+        }
+    }
+    for (const key of ( baseToLocal.updated.values())) {
+        if (( conflicts.has(key))) {
+            continue;
+        }
+        if (( baseToRemote.updated.has(key))) {
+            if (( localToRemote.updated.has(key))) {
+                conflicts.add(key);
+            }
+        }
+        else {
+            remoteUpdated[key] = local[key];
+        }
+    }
+    for (const key of ( baseToRemote.updated.values())) {
+        if (( conflicts.has(key))) {
+            continue;
+        }
+        if (( baseToLocal.updated.has(key))) {
+            if (( localToRemote.updated.has(key))) {
+                conflicts.add(key);
+            }
+        }
+        else if (local[key] !== undefined) {
+            localUpdated[key] = remote[key];
+        }
+    }
+    for (const key of ( baseToLocal.added.values())) {
+        if (( conflicts.has(key))) {
+            continue;
+        }
+        if (( baseToRemote.added.has(key))) {
+            if (( localToRemote.updated.has(key))) {
+                conflicts.add(key);
+            }
+        }
+        else {
+            remoteAdded[key] = local[key];
+        }
+    }
+    for (const key of ( baseToRemote.added.values())) {
+        if (( conflicts.has(key))) {
+            continue;
+        }
+        if (( baseToLocal.added.has(key))) {
+            if (( localToRemote.updated.has(key))) {
+                conflicts.add(key);
+            }
+        }
+        else {
+            localAdded[key] = remote[key];
+        }
+    }
+    return {
+        local: { added: localAdded, removed: [...( localRemoved.values())], updated: localUpdated },
+        remote: { added: remoteAdded, removed: [...( remoteRemoved.values())], updated: remoteUpdated },
+        conflicts: [...( conflicts.values())],
+    };
+}
+function compare(from, to) {
+    const fromKeys = from ? ( Object.keys(from)) : [];
+    const toKeys = to ? ( Object.keys(to)) : [];
+    const added = toKeys.filter(key => !fromKeys.includes(key)).reduce((r, key) => { r.add(key); return r; }, ( new Set()));
+    const removed = fromKeys.filter(key => !toKeys.includes(key)).reduce((r, key) => { r.add(key); return r; }, ( new Set()));
+    const updated = ( new Set());
+    for (const key of fromKeys) {
+        if (( removed.has(key))) {
+            continue;
+        }
+        const fromPrompt = from[key];
+        const toPrompt = to[key];
+        if (fromPrompt !== toPrompt) {
+            updated.add(key);
+        }
+    }
+    return { added, removed, updated };
+}
+function areSame(a, b) {
+    const { added, removed, updated } = compare(a, b);
+    return added.size === 0 && removed.size === 0 && updated.size === 0;
+}
+
+export { areSame, merge };

package/vscode/src/vs/platform/userDataSync/common/promptsSync/promptsSync.d.ts

@@ -0,0 +1,43 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IStringDictionary } from "@codingame/monaco-vscode-api/vscode/vs/base/common/collections";
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
+import { IUserDataProfile } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { AbstractSynchroniser, IAcceptResult, IFileResourcePreview, IMergeResult } from "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IRemoteUserData, ISyncData, IUserDataSynchroniser } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync";
+import { IUserDataSyncLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";
+import { IUserDataSyncEnablementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";
+import { IUserDataSyncLocalStoreService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";
+import { IUserDataSyncStoreService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";
+interface IPromptsResourcePreview extends IFileResourcePreview {
+    previewResult: IMergeResult;
+}
+export declare function parsePrompts(syncData: ISyncData): IStringDictionary<string>;
+export declare class PromptsSynchronizer extends AbstractSynchroniser implements IUserDataSynchroniser {
+    protected readonly version: number;
+    private readonly promptsFolder;
+    constructor(profile: IUserDataProfile, collection: string | undefined, environmentService: IEnvironmentService, fileService: IFileService, storageService: IStorageService, userDataSyncStoreService: IUserDataSyncStoreService, userDataSyncLocalStoreService: IUserDataSyncLocalStoreService, logService: IUserDataSyncLogService, configurationService: IConfigurationService, userDataSyncEnablementService: IUserDataSyncEnablementService, telemetryService: ITelemetryService, uriIdentityService: IUriIdentityService);
+    protected generateSyncPreview(remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData | null, isRemoteDataFromCurrentMachine: boolean): Promise<IPromptsResourcePreview[]>;
+    protected hasRemoteChanged(lastSyncUserData: IRemoteUserData): Promise<boolean>;
+    protected getMergeResult(resourcePreview: IPromptsResourcePreview, token: CancellationToken): Promise<IMergeResult>;
+    protected getAcceptResult(resourcePreview: IPromptsResourcePreview, resource: URI, content: string | null | undefined, token: CancellationToken): Promise<IAcceptResult>;
+    protected applyResult(remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData | null, resourcePreviews: [
+        IPromptsResourcePreview,
+        IAcceptResult
+    ][], force: boolean): Promise<void>;
+    private getResourcePreviews;
+    resolveContent(uri: URI): Promise<string | null>;
+    hasLocalData(): Promise<boolean>;
+    private updateLocalBackup;
+    private updateLocalPrompts;
+    private updateRemotePrompts;
+    private parsePrompts;
+    private toPromptContents;
+    private getPromptsFileContents;
+}
+export {};