## 0.24.14

### Fixed - Resolving conflicts of JSON files (and sensibly merging them) is now working fine, again! - And, failure logs are more informative. - More robust to release the event listeners on unwatching the local database. ### Refactored - JSON file conflict resolution dialogue has been rewritten into svelte v5. - Upgrade eslint. - Remove unnecessary pragma comments for eslint.
2025-10-06 22:16:55 +02:00 · 2025-02-18 12:59:18 +00:00
parent f6d5b78cc8
commit 70f4e23474
13 changed files with 3272 additions and 2186 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,11 +0,0 @@
-node_modules
-build
-.eslintrc.js.bak
-src/lib/src/patches/pouchdb-utils
-esbuild.config.mjs
-rollup.config.js
-src/lib/test
-src/lib/src/cli
-main.js
-src/lib/apps/webpeer/dist
-src/lib/apps/webpeer/svelte.config.js
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,13 +1,34 @@
 {
    "root": true,
    "parser": "@typescript-eslint/parser",
-    "plugins": ["@typescript-eslint"],
-    "extends": ["eslint:recommended", "plugin:@typescript-eslint/eslint-recommended", "plugin:@typescript-eslint/recommended"],
+    "plugins": [
+        "@typescript-eslint",
+        "eslint-plugin-svelte",
+        "eslint-plugin-import"
+    ],
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/eslint-recommended",
+        "plugin:@typescript-eslint/recommended"
+    ],
    "parserOptions": {
        "sourceType": "module",
-        "project": ["tsconfig.json"]
+        "project": [
+            "tsconfig.json"
+        ]
    },
-    "ignorePatterns": [],
+    "ignorePatterns": [
+        "**/node_modules/*",
+        "**/jest.config.js",
+        "src/lib/coverage",
+        "src/lib/browsertest",
+        "**/test.ts",
+        "**/tests.ts",
+        "**/**test.ts",
+        "**/**.test.ts",
+        "esbuild.*.mjs",
+        "terser.*.mjs"
+    ],
    "rules": {
        "no-unused-vars": "off",
        "@typescript-eslint/no-unused-vars": [
@@ -34,4 +55,4 @@
            }
        ]
    }
-}
+}
--- a/esbuild.config.mjs
+++ b/esbuild.config.mjs
@@ -4,7 +4,7 @@ import esbuild from "esbuild";
 import process from "process";
 import builtins from "builtin-modules";
 import sveltePlugin from "esbuild-svelte";
-import sveltePreprocess from "svelte-preprocess";
+import { sveltePreprocess } from "svelte-preprocess";
 import fs from "node:fs";
 // import terser from "terser";
 import { minify } from "terser";
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -0,0 +1,100 @@
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import svelte from "eslint-plugin-svelte";
+import _import from "eslint-plugin-import";
+import { fixupPluginRules } from "@eslint/compat";
+import tsParser from "@typescript-eslint/parser";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all,
+});
+
+export default [
+    {
+        ignores: [
+            "**/node_modules/*",
+            "**/jest.config.js",
+            "src/lib/coverage",
+            "src/lib/browsertest",
+            "**/test.ts",
+            "**/tests.ts",
+            "**/**test.ts",
+            "**/**.test.ts",
+            "**/esbuild.*.mjs",
+            "**/terser.*.mjs",
+            "**/node_modules",
+            "**/build",
+            "**/.eslintrc.js.bak",
+            "src/lib/src/patches/pouchdb-utils",
+            "**/esbuild.config.mjs",
+            "**/rollup.config.js",
+            "modules/octagonal-wheels/rollup.config.js",
+            "modules/octagonal-wheels/dist/**/*",
+            "src/lib/test",
+            "src/lib/src/cli",
+            "**/main.js",
+            "src/lib/apps/webpeer/dist",
+            "src/lib/apps/webpeer/svelte.config.js",
+        ],
+    },
+    ...compat.extends(
+        "eslint:recommended",
+        "plugin:@typescript-eslint/eslint-recommended",
+        "plugin:@typescript-eslint/recommended"
+    ),
+    {
+        plugins: {
+            "@typescript-eslint": typescriptEslint,
+            svelte,
+            import: fixupPluginRules(_import),
+        },
+
+        languageOptions: {
+            parser: tsParser,
+            ecmaVersion: 5,
+            sourceType: "module",
+
+            parserOptions: {
+                project: ["tsconfig.json"],
+            },
+        },
+
+        rules: {
+            "no-unused-vars": "off",
+
+            "@typescript-eslint/no-unused-vars": [
+                "error",
+                {
+                    args: "none",
+                },
+            ],
+
+            "no-unused-labels": "off",
+            "@typescript-eslint/ban-ts-comment": "off",
+            "no-prototype-builtins": "off",
+            "@typescript-eslint/no-empty-function": "off",
+            "require-await": "error",
+            "@typescript-eslint/require-await": "warn",
+            "@typescript-eslint/no-misused-promises": "warn",
+            "@typescript-eslint/no-floating-promises": "warn",
+            "no-async-promise-executor": "warn",
+            "@typescript-eslint/no-explicit-any": "off",
+            "@typescript-eslint/no-unnecessary-type-assertion": "error",
+
+            "no-constant-condition": [
+                "error",
+                {
+                    checkLoops: false,
+                },
+            ],
+        },
+    },
+];
+
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -22,6 +22,9 @@
    "license": "MIT",
    "devDependencies": {
        "@chialab/esbuild-plugin-worker": "^0.18.1",
+        "@eslint/compat": "^1.2.6",
+        "@eslint/eslintrc": "^3.2.0",
+        "@eslint/js": "^9.20.0",
        "@tsconfig/svelte": "^5.0.4",
        "@types/diff-match-patch": "^1.0.36",
        "@types/node": "^22.5.4",
@@ -33,17 +36,17 @@
        "@types/pouchdb-mapreduce": "^6.1.10",
        "@types/pouchdb-replication": "^6.4.7",
        "@types/transform-pouch": "^1.0.6",
-        "@typescript-eslint/eslint-plugin": "^8.23.0",
-        "@typescript-eslint/parser": "^8.23.0",
+        "@typescript-eslint/eslint-plugin": "^8.24.1",
+        "@typescript-eslint/parser": "^8.24.1",
        "builtin-modules": "^4.0.0",
        "esbuild": "0.24.2",
        "esbuild-svelte": "^0.9.0",
-        "eslint": "^8.57.0",
-        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint": "^9.20.1",
        "eslint-plugin-import": "^2.31.0",
+        "eslint-plugin-svelte": "^2.46.1",
        "events": "^3.3.0",
        "obsidian": "^1.7.2",
-        "postcss": "^8.5.1",
+        "postcss": "^8.5.2",
        "postcss-load-config": "^6.0.1",
        "pouchdb-adapter-http": "^9.0.0",
        "pouchdb-adapter-idb": "^9.0.0",
@@ -55,10 +58,10 @@
        "pouchdb-merge": "^9.0.0",
        "pouchdb-replication": "^9.0.0",
        "pouchdb-utils": "^9.0.0",
-        "prettier": "^3.4.2",
-        "svelte": "^5.19.7",
+        "prettier": "^3.5.1",
+        "svelte": "^5.20.1",
        "svelte-preprocess": "^6.0.3",
-        "terser": "^5.37.0",
+        "terser": "^5.39.0",
        "transform-pouch": "^2.0.0",
        "tslib": "^2.8.1",
        "tsx": "^4.19.2",
@@ -76,7 +79,7 @@
        "minimatch": "^10.0.1",
        "octagonal-wheels": "^0.1.23",
        "svelte-check": "^4.1.4",
-        "trystero": "^0.20.0",
+        "trystero": "^0.20.1",
        "xxhash-wasm-102": "npm:xxhash-wasm@^1.0.2"
    }
 }
--- a/src/features/HiddenFileCommon/JsonResolveModal.ts
+++ b/src/features/HiddenFileCommon/JsonResolveModal.ts
@@ -2,13 +2,14 @@ import { App, Modal } from "../../deps.ts";
 import { type FilePath, type LoadedEntry } from "../../lib/src/common/types.ts";
 import JsonResolvePane from "./JsonResolvePane.svelte";
 import { waitForSignal } from "../../lib/src/common/utils.ts";
+import { mount, unmount } from "svelte";

 export class JsonResolveModal extends Modal {
    // result: Array<[number, string]>;
    filename: FilePath;
    callback?: (keepRev?: string, mergedStr?: string) => Promise<void>;
    docs: LoadedEntry[];
-    component?: JsonResolvePane;
+    component?: ReturnType<typeof mount>;
    nameA: string;
    nameB: string;
    defaultSelect: string;
@@ -55,7 +56,7 @@ export class JsonResolveModal extends Modal {
        contentEl.empty();

        if (this.component == undefined) {
-            this.component = new JsonResolvePane({
+            this.component = mount(JsonResolvePane, {
                target: contentEl,
                props: {
                    docs: this.docs,
@@ -81,7 +82,7 @@ export class JsonResolveModal extends Modal {
            void this.callback(undefined);
        }
        if (this.component != undefined) {
-            this.component.$destroy();
+            void unmount(this.component);
            this.component = undefined;
        }
    }
--- a/src/features/HiddenFileCommon/JsonResolvePane.svelte
+++ b/src/features/HiddenFileCommon/JsonResolvePane.svelte
@@ -2,29 +2,64 @@
    import { type Diff, DIFF_DELETE, DIFF_INSERT, diff_match_patch } from "../../deps.ts";
    import type { FilePath, LoadedEntry } from "../../lib/src/common/types.ts";
    import { decodeBinary, readString } from "../../lib/src/string_and_binary/convert.ts";
-    import { getDocData, mergeObject } from "../../lib/src/common/utils.ts";
+    import { getDocData, isObjectDifferent, mergeObject } from "../../lib/src/common/utils.ts";

-    export let docs: LoadedEntry[] = [];
-    export let callback: (keepRev?: string, mergedStr?: string) => Promise<void> = async (_, __) => {
-        Promise.resolve();
-    };
-    export let filename: FilePath = "" as FilePath;
-    export let nameA: string = "A";
-    export let nameB: string = "B";
-    export let defaultSelect: string = "";
-    export let keepOrder = false;
-    export let hideLocal: boolean = false;
-    let docA: LoadedEntry;
-    let docB: LoadedEntry;
-    let docAContent = "";
-    let docBContent = "";
-    let objA: any = {};
-    let objB: any = {};
-    let objAB: any = {};
-    let objBA: any = {};
-    let diffs: Diff[];
+    interface Props {
+        docs?: LoadedEntry[];
+        callback?: (keepRev?: string, mergedStr?: string) => Promise<void>;
+        filename?: FilePath;
+        nameA?: string;
+        nameB?: string;
+        defaultSelect?: string;
+        keepOrder?: boolean;
+        hideLocal?: boolean;
+    }
+
+    let {
+        docs = $bindable([]),
+        callback = $bindable((async (_, __) => {
+            Promise.resolve();
+        }) as (keepRev?: string, mergedStr?: string) => Promise<void>),
+        filename = $bindable("" as FilePath),
+        nameA = $bindable("A"),
+        nameB = $bindable("B"),
+        defaultSelect = $bindable("" as string),
+        keepOrder = $bindable(false),
+        hideLocal = $bindable(false),
+    }: Props = $props();
+    type JSONData = Record<string | number | symbol, any> | [any];
+
+    const docsArray = $derived.by(() => {
+        if (docs && docs.length >= 1) {
+            if (keepOrder || docs[0].mtime < docs[1].mtime) {
+                return { a: docs[0], b: docs[1] } as const;
+            } else {
+                return { a: docs[1], b: docs[0] } as const;
+            }
+        }
+        return { a: false, b: false } as const;
+    });
+    const docA = $derived(docsArray.a);
+    const docB = $derived(docsArray.b);
+    const docAContent = $derived(docA && docToString(docA));
+    const docBContent = $derived(docB && docToString(docB));
+
+    function parseJson(json: string | false) {
+        if (json === false) return false;
+        try {
+            return JSON.parse(json) as JSONData;
+        } catch (ex) {
+            return false;
+        }
+    }
+    const objA = $derived(parseJson(docAContent) || {});
+    const objB = $derived(parseJson(docBContent) || {});
+    const objAB = $derived(mergeObject(objA, objB));
+    const objBAw = $derived(mergeObject(objB, objA));
+    const objBA = $derived(isObjectDifferent(objBAw, objAB) ? objBAw : false);
+    let diffs: Diff[] = $derived.by(() => (objA && selectedObj ? getJsonDiff(objA, selectedObj) : []));
    type SelectModes = "" | "A" | "B" | "AB" | "BA";
-    let mode: SelectModes = defaultSelect as SelectModes;
+    let mode: SelectModes = $state(defaultSelect as SelectModes);

    function docToString(doc: LoadedEntry) {
        return doc.datatype == "plain" ? getDocData(doc.data) : readString(new Uint8Array(decodeBinary(doc.data)));
@@ -45,6 +80,7 @@
        return getDiff(JSON.stringify(a, null, 2), JSON.stringify(b, null, 2));
    }
    function apply() {
+        if (!docA || !docB) return;
        if (docA._id == docB._id) {
            if (mode == "A") return callback(docA._rev!, undefined);
            if (mode == "B") return callback(docB._rev!, undefined);
@@ -59,50 +95,23 @@
    function cancel() {
        callback(undefined, undefined);
    }
-    $: {
-        if (docs && docs.length >= 1) {
-            if (keepOrder || docs[0].mtime < docs[1].mtime) {
-                docA = docs[0];
-                docB = docs[1];
-            } else {
-                docA = docs[1];
-                docB = docs[0];
-            }
-            docAContent = docToString(docA);
-            docBContent = docToString(docB);
+    const mergedObjs = $derived.by(
+        () =>
+            ({
+                "": false,
+                A: objA,
+                B: objB,
+                AB: objAB,
+                BA: objBA,
+            }) as Record<SelectModes, JSONData | false>
+    );

-            try {
-                objA = false;
-                objB = false;
-                objA = JSON.parse(docAContent);
-                objB = JSON.parse(docBContent);
-                objAB = mergeObject(objA, objB);
-                objBA = mergeObject(objB, objA);
-                if (JSON.stringify(objAB) == JSON.stringify(objBA)) {
-                    objBA = false;
-                }
-            } catch (ex) {
-                objBA = false;
-                objAB = false;
-            }
-        }
-    }
-    $: mergedObjs = {
-        "": false,
-        A: objA,
-        B: objB,
-        AB: objAB,
-        BA: objBA,
-    };
+    let selectedObj = $derived(mode in mergedObjs ? mergedObjs[mode] : {});

-    $: selectedObj = mode in mergedObjs ? mergedObjs[mode] : {};
-    $: {
-        diffs = getJsonDiff(objA, selectedObj);
-    }
+    let modesSrc = $state([] as ["" | "A" | "B" | "AB" | "BA", string][]);

-    let modes = [] as ["" | "A" | "B" | "AB" | "BA", string][];
-    $: {
-        let newModes = [] as typeof modes;
+    const modes = $derived.by(() => {
+        let newModes = [] as typeof modesSrc;

        if (!hideLocal) {
            newModes.push(["", "Not now"]);
@@ -111,15 +120,15 @@
        newModes.push(["B", nameB || "B"]);
        newModes.push(["AB", `${nameA || "A"} + ${nameB || "B"}`]);
        newModes.push(["BA", `${nameB || "B"} + ${nameA || "A"}`]);
-        modes = newModes;
-    }
+        return newModes;
+    });
 </script>

 <h2>{filename}</h2>
 {#if !docA || !docB}
    <div class="message">Just for a minute, please!</div>
    <div class="buttons">
-        <button on:click={apply}>Dismiss</button>
+        <button onclick={apply}>Dismiss</button>
    </div>
 {:else}
    <div class="options">
@@ -148,39 +157,39 @@
    <div class="infos">
        <table>
            <tbody>
-            <tr>
-                <th>{nameA}</th>
-                <td
-                    >{#if docA._id == docB._id}
-                        Rev:{revStringToRevNumber(docA._rev)}
-                    {/if}
-                    {new Date(docA.mtime).toLocaleString()}</td
-                >
-                <td>
-                    {docAContent.length} letters
-                </td>
-            </tr>
-            <tr>
-                <th>{nameB}</th>
-                <td
-                    >{#if docA._id == docB._id}
-                        Rev:{revStringToRevNumber(docB._rev)}
-                    {/if}
-                    {new Date(docB.mtime).toLocaleString()}</td
-                >
-                <td>
-                    {docBContent.length} letters
-                </td>
-            </tr>
+                <tr>
+                    <th>{nameA}</th>
+                    <td
+                        >{#if docA._id == docB._id}
+                            Rev:{revStringToRevNumber(docA._rev)}
+                        {/if}
+                        {new Date(docA.mtime).toLocaleString()}</td
+                    >
+                    <td>
+                        {docAContent && docAContent.length} letters
+                    </td>
+                </tr>
+                <tr>
+                    <th>{nameB}</th>
+                    <td
+                        >{#if docA._id == docB._id}
+                            Rev:{revStringToRevNumber(docB._rev)}
+                        {/if}
+                        {new Date(docB.mtime).toLocaleString()}</td
+                    >
+                    <td>
+                        {docBContent && docBContent.length} letters
+                    </td>
+                </tr>
            </tbody>
        </table>
    </div>

    <div class="buttons">
        {#if hideLocal}
-            <button on:click={cancel}>Cancel</button>
+            <button onclick={cancel}>Cancel</button>
        {/if}
-        <button on:click={apply}>Apply</button>
+        <button onclick={apply}>Apply</button>
    </div>
 {/if}

--- a/src/features/HiddenFileSync/CmdHiddenFileSync.ts
+++ b/src/features/HiddenFileSync/CmdHiddenFileSync.ts
@@ -701,7 +701,7 @@ Offline Changed files: ${processFiles.length}`;
                            ?.filter((e) => e.status == "available" && Number(e.rev.split("-")[0]) < conflictedRevNo)
                            .first()?.rev ?? "";
                    const result = await this.plugin.localDatabase.mergeObject(
-                        path,
+                        doc.path,
                        commonBase,
                        doc._rev,
                        conflictedRev
--- a/src/lib
+++ b/src/lib
--- a/src/modules/essentialObsidian/ModuleObsidianMenu.ts
+++ b/src/modules/essentialObsidian/ModuleObsidianMenu.ts
@@ -106,7 +106,6 @@ export class ModuleObsidianMenu extends AbstractObsidianModule implements IObsid
    }
    $everyOnload(): Promise<boolean> {
        this.app.workspace.onLayoutReady(this.core.$$onLiveSyncReady.bind(this.core));
-        // eslint-disable-next-line no-unused-labels
        return Promise.resolve(true);
    }

--- a/src/modules/extras/ModuleDev.ts
+++ b/src/modules/extras/ModuleDev.ts
@@ -36,7 +36,6 @@ export class ModuleDev extends AbstractObsidianModule implements IObsidianModule

    $everyOnloadAfterLoadSettings(): Promise<boolean> {
        if (!this.settings.enableDebugTools) return Promise.resolve(true);
-        // eslint-disable-next-line no-unused-labels
        this.onMissingTranslation = this.onMissingTranslation.bind(this);
        __onMissingTranslation((key) => {
            void this.onMissingTranslation(key);
--- a/src/modules/extras/devUtil/TestPaneView.ts
+++ b/src/modules/extras/devUtil/TestPaneView.ts
@@ -30,7 +30,6 @@ export class TestPaneView extends ItemView {
        return "Self-hosted LiveSync Test and Results";
    }

-    // eslint-disable-next-line require-await
    async onOpen() {
        this.component = new TestPaneComponent({
            target: this.contentEl,
@@ -42,7 +41,6 @@ export class TestPaneView extends ItemView {
        await Promise.resolve();
    }

-    // eslint-disable-next-line require-await
    async onClose() {
        this.component?.$destroy();
        await Promise.resolve();