public/obsidian-livesync
1
0 Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-11-03 23:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Narrow service and command composition

Browse Source
This commit is contained in:
vorotamoroz committed 2026-10-29 15:00:19 +00:00
1 parent 273079e827
commit 4027417bf5
22 files changed
+928 -202
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/serviceFeatures/setupObsidian/setupUri.ts
+25 -17
View File
@@ -1,3 +1,4 @@
import { createCommandCheck } from "@vrtmrz/obsidian-plugin-kit/command";
import { LOG_LEVEL_NOTICE, type ObsidianLiveSyncSettings } from "@vrtmrz/livesync-commonlib/compat/common/types";
import type { LogFunction } from "@vrtmrz/livesync-commonlib/compat/services/lib/logUtils";
import { createInstanceLogFunction } from "@vrtmrz/livesync-commonlib/compat/services/lib/logUtils";
@@ -112,33 +113,40 @@ export function useSetupURIFeature(host: NecessaryServices<"API" | "UI" | "setti
host.services.API.addCommand({
id: "livesync-copysetupuri",
name: "Copy settings as a new setup URI",
checkCallback: (checking) => {
if (!host.services.setting.currentSettings().isConfigured) return false;
if (!checking) fireAndForget(copySetupURI(host, log));
return true;
},
checkCallback: createCommandCheck(
() => host.services.setting.currentSettings().isConfigured,
() => {
fireAndForget(copySetupURI(host, log));
}
),
});
host.services.API.addCommand({
id: "livesync-copysetupuri-short",
name: "Copy settings as a new setup URI (With customization sync)",
checkCallback: (checking) => {
const settings = host.services.setting.currentSettings();
if (!settings.isConfigured || !settings.usePluginSync) return false;
if (!checking) fireAndForget(copySetupURI(host, log, false));
return true;
},
checkCallback: createCommandCheck(
() => {
const settings = host.services.setting.currentSettings();
return settings.isConfigured && settings.usePluginSync;
},
() => {
fireAndForget(copySetupURI(host, log, false));
}
),
});
host.services.API.addCommand({
id: "livesync-copysetupurifull",
name: "Copy settings as a new setup URI (Full)",
checkCallback: (checking) => {
const settings = host.services.setting.currentSettings();
if (!settings.isConfigured || !settings.useAdvancedMode) return false;
if (!checking) fireAndForget(copySetupURIFull(host, log));
return true;
},
checkCallback: createCommandCheck(
() => {
const settings = host.services.setting.currentSettings();
return settings.isConfigured && settings.useAdvancedMode;
},
() => {
fireAndForget(copySetupURIFull(host, log));
}
),
});
host.services.context.events.onEvent(EVENT_REQUEST_COPY_SETUP_URI, () =>
src/serviceFeatures/setupObsidian/setupUri.unit.spec.ts
+9 -2
View File
@@ -221,7 +221,7 @@ describe("setupObsidian/setupUri", () => {
},
UI: {
confirm: {
askString: vi.fn(() => "pass"),
askString: vi.fn(async () => false),
},
promptCopyToClipboard: vi.fn(() => true),
},
@@ -269,7 +269,7 @@ describe("setupObsidian/setupUri", () => {
},
UI: {
confirm: {
askString: vi.fn(() => "pass"),
askString: vi.fn(async () => false),
},
promptCopyToClipboard: vi.fn(() => true),
},
@@ -292,5 +292,12 @@ describe("setupObsidian/setupUri", () => {
settings.useAdvancedMode = true;
expect(command("livesync-copysetupuri-short").checkCallback?.(true)).toBe(true);
expect(command("livesync-copysetupurifull").checkCallback?.(true)).toBe(true);
expect(host.services.UI.confirm.askString).not.toHaveBeenCalled();
settings.isConfigured = false;
for (const registered of commands) expect(registered.checkCallback?.(false)).toBe(false);
expect(host.services.UI.confirm.askString).not.toHaveBeenCalled();
settings.isConfigured = true;
for (const registered of commands) expect(registered.checkCallback?.(false)).toBe(true);
expect(host.services.UI.confirm.askString).toHaveBeenCalledTimes(3);
});
});