@vrtmrz/livesync-commonlib 0.1.41 → 0.1.42

package/dist/serviceModules/ServiceFileHandlerBase.js

@@ -6,6 +6,7 @@ import {
   readAsBlob,
   readContent
 } from "../common/utils.js";
+import { computeFileContentHash } from "../common/fileContentHash.js";
 import { EVENT_CONFLICT_CANCELLED } from "../events/coreEvents.js";
 import { shouldBeIgnored, stripAllPrefixes } from "../string_and_binary/path.js";
 import { Semaphore } from "octagonal-wheels/concurrency/semaphore";
@@ -13,6 +14,7 @@ import { ServiceModuleBase } from "./ServiceModuleBase.js";
 import { getStoragePathFromUXFileInfo } from "../common/typeUtils.js";
 import { EVEN } from "../common/models/shared.const.symbols.js";
 import { tryGetFilePath } from "../common/utils.doc.js";
+import { getPathNormalizationVersion, normalisePathForIdentity } from "../common/pathNormalization.js";
 async function serializedByKeys(keys, callback) {
   const [key, ...remainingKeys] = keys;
   if (key === void 0) return await callback();
@@ -25,6 +27,12 @@ function getParentPath(path) {
 function isFolderInfo(info) {
   return info?.isFolder === true;
 }
+function hasContentHash(record) {
+  return !!record && typeof record.contentHash === "string" && /^sha256:[0-9a-f]{64}$/.test(record.contentHash) && Number.isSafeInteger(record.contentSize) && record.contentSize >= 0;
+}
+function sameProvenance(left, right) {
+  return left?.revision === right?.revision && left?.observedStorageMtime === right?.observedStorageMtime && left?.contentHash === right?.contentHash && left?.contentSize === right?.contentSize;
+}
 class ServiceFileHandlerBase extends ServiceModuleBase {
   events;
   databaseFileAccess;
@@ -34,6 +42,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
   setting;
   vault;
   fileReflectionProvenance;
+  contentHashes = /* @__PURE__ */ new WeakMap();
   deferredConflictChecks = /* @__PURE__ */ new Map();
   constructor(services) {
     super(services);
@@ -54,28 +63,51 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
   get storage() {
     return this.storageAccess;
   }
+  getProvenancePath(path) {
+    return normalisePathForIdentity(
+      path,
+      getPathNormalizationVersion(this.setting.currentSettings())
+    );
+  }
   async getProvenance(path) {
     if (!this.fileReflectionProvenance) return void 0;
     try {
-      const record = await this.fileReflectionProvenance.get(path);
+      const record = await this.fileReflectionProvenance.get(this.getProvenancePath(path));
       if (!record) return void 0;
       const entry = await this.db.fetchEntryMeta(path, record.revision, true);
       if (entry && !entry._deleted && !entry.deleted) {
         return record;
       }
-      await this.fileReflectionProvenance.delete(path);
+      if (!hasContentHash(record)) await this.fileReflectionProvenance.delete(this.getProvenancePath(path));
     } catch (ex) {
       this._log(`Could not read file reflection provenance for ${path}`, LOG_LEVEL_VERBOSE);
       this._log(ex, LOG_LEVEL_VERBOSE);
     }
     return void 0;
   }
-  async setProvenance(path, revision, observedStorageMtime) {
+  async contentEvidence(content) {
+    if (!this.fileReflectionProvenance) return {};
+    try {
+      let hash = this.contentHashes.get(content);
+      if (!hash) {
+        hash = computeFileContentHash(content);
+        this.contentHashes.set(content, hash);
+      }
+      return { contentHash: await hash, contentSize: content.size };
+    } catch (ex) {
+      this.contentHashes.delete(content);
+      this._log("Could not hash file reflection content", LOG_LEVEL_VERBOSE);
+      this._log(ex, LOG_LEVEL_VERBOSE);
+      return {};
+    }
+  }
+  async setProvenance(path, revision, observedStorageMtime, content, evidence) {
     if (!this.fileReflectionProvenance || !revision) return;
     try {
-      await this.fileReflectionProvenance.set(path, {
+      await this.fileReflectionProvenance.set(this.getProvenancePath(path), {
         revision,
-        observedStorageMtime
+        observedStorageMtime,
+        ...evidence ?? await this.contentEvidence(content)
       });
     } catch (ex) {
       this._log(`Could not record file reflection provenance for ${path}`, LOG_LEVEL_VERBOSE);
@@ -85,7 +117,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
   async deleteProvenance(path) {
     if (!this.fileReflectionProvenance) return;
     try {
-      await this.fileReflectionProvenance.delete(path);
+      await this.fileReflectionProvenance.delete(this.getProvenancePath(path));
     } catch (ex) {
       this._log(`Could not delete file reflection provenance for ${path}`, LOG_LEVEL_VERBOSE);
       this._log(ex, LOG_LEVEL_VERBOSE);
@@ -109,7 +141,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
     }
     const matched = await this.findUniqueContentRevision(file);
     if (matched) {
-      await this.setProvenance(path, matched, file.stat.mtime);
+      await this.setProvenance(path, matched, file.stat.mtime, file.body);
       return matched;
     }
     return void 0;
@@ -123,12 +155,16 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
    * identifies provenance; no match is `unknown`.
    * `preferredPath` selects the provenance key during a rename, and
    * `currentLoaded` supplies an already decoded candidate body when available.
-   * Missing chunks do not clear provenance unless their metadata is also
-   * missing or deleted.
+   * A valid saved content hash can prove unchanged bytes after revision
+   * pruning. It cannot reconstruct ancestry for an edited file.
    */
-  async classifyStorageContent(file, currentEntry, preferredPath, recordedRevision, currentLoaded) {
+  async classifyStorageContent(file, currentEntry, preferredPath, recorded, currentLoaded) {
     const path = preferredPath ?? file.path;
+    const recordedRevision = recorded?.revision;
     if (recordedRevision) {
+      if (hasContentHash(recorded) && recorded.contentSize === file.body.size && (await this.contentEvidence(file.body)).contentHash === recorded.contentHash) {
+        return { kind: "unchanged", revision: recordedRevision };
+      }
       const loadedContentIsDecoded = currentLoaded?._rev === recordedRevision;
       const base = loadedContentIsDecoded ? currentLoaded : await this.db.fetchEntry(file, recordedRevision, true, true, true);
       if (base && base._rev === recordedRevision && !("deleted" in base && base.deleted) && !("_deleted" in base && base._deleted)) {
@@ -137,7 +173,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
       }
       if (!base) {
         const meta = await this.db.fetchEntryMeta(file, recordedRevision, true);
-        if (!meta || meta.deleted || meta._deleted) await this.deleteProvenance(path);
+        if ((!meta || meta.deleted || meta._deleted) && !hasContentHash(recorded)) await this.deleteProvenance(path);
       }
     }
     const matches = currentEntry ? await this.db.findLiveContentRevisions(file, file.body) : [];
@@ -147,8 +183,8 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
     return { kind: "unknown" };
   }
   /** Record provenance only when storage matches one unambiguous live leaf. */
-  async rememberMatchingLeaf(path, revision, mtime) {
-    if (revision) await this.setProvenance(path, revision, mtime);
+  async rememberMatchingLeaf(path, revision, mtime, content, evidence) {
+    if (revision) await this.setProvenance(path, revision, mtime, content, evidence);
   }
   /**
    * Read the raw provenance value used by an optimistic storage snapshot.
@@ -157,7 +193,8 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
    */
   async readProvenanceSnapshot(path) {
     try {
-      return (await this.fileReflectionProvenance?.get(path))?.revision;
+      const record = await this.fileReflectionProvenance?.get(this.getProvenancePath(path));
+      return record ? { ...record } : void 0;
     } catch {
       return void 0;
     }
@@ -170,7 +207,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
     const current = await this.storage.getStub(file.path);
     if (!current || isFolderInfo(current) || current.path !== file.path) return false;
     const readCurrent = await this.readFileFromStub(current);
-    return readCurrent.stat.mtime === file.stat.mtime && await isDocContentSame(readCurrent.body, file.body) && await this.readProvenanceSnapshot(file.path) === revision;
+    return readCurrent.stat.mtime === file.stat.mtime && await isDocContentSame(readCurrent.body, file.body) && sameProvenance(await this.readProvenanceSnapshot(file.path), revision);
   }
   /**
    * Publish provenance after a durable database write if storage is unchanged.
@@ -178,8 +215,9 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
    * caller to reread storage before proceeding.
    */
   async finaliseStoredRevision(file, observedProvenance, storedRevision) {
+    const evidence = await this.contentEvidence(file.body);
     if (await this.currentStorageSnapshotMatches(file, observedProvenance)) {
-      await this.setProvenance(file.path, storedRevision, file.stat.mtime);
+      await this.setProvenance(file.path, storedRevision, file.stat.mtime, file.body, evidence);
       return true;
     } else {
       return false;
@@ -221,7 +259,10 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
     try {
       return await this.serializedByFileEventPaths([path], async () => {
         const provenance = this.fileReflectionProvenance;
-        if (await provenance.get(path)) return false;
+        const provenancePath = this.getProvenancePath(path);
+        const existing = await provenance.get(provenancePath);
+        const observed = existing ? { ...existing } : void 0;
+        if (observed && (observed.revision !== expectedRevision || hasContentHash(observed))) return false;
         const stub = await this.storage.getStub(path);
         if (!stub || isFolderInfo(stub) || stub.path !== path) return false;
         const file = await this.readFileFromStub(stub);
@@ -231,12 +272,14 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
         const entry = await this.db.fetchEntry(path, expectedRevision, true, true, true);
         if (!entry || entry._rev !== expectedRevision || entry.deleted || entry._deleted) return false;
         if (!await isDocContentSame(readContent(entry), file.body)) return false;
+        const evidence = await this.contentEvidence(file.body);
+        if (!evidence.contentHash) return false;
         const latest = await this.db.fetchEntryMeta(path, void 0, true);
         if (!latest || latest._rev !== expectedRevision || latest.deleted || latest._deleted) return false;
         if ((await this.db.getConflictedRevs(path)).length > 0) return false;
-        if (!await this.currentStorageSnapshotMatches(file, void 0)) return false;
-        if (await provenance.get(path)) return false;
-        await provenance.set(path, { revision: expectedRevision, observedStorageMtime: file.stat.mtime });
+        if (!await this.currentStorageSnapshotMatches(file, observed)) return false;
+        if (!sameProvenance(await provenance.get(provenancePath), observed)) return false;
+        await provenance.set(provenancePath, { revision: expectedRevision, observedStorageMtime: file.stat.mtime, ...evidence });
         return true;
       });
     } catch (ex) {
@@ -300,7 +343,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
     if (!baseEntry.deleted && !baseEntry._deleted) {
       const loadedBase = await this.db.fetchEntry(file, baseRevision, true, true);
       if (loadedBase && await isDocContentSame(getDocDataAsArray(loadedBase.data), readFile.body)) {
-        await this.setProvenance(file.path, baseRevision, readFile.stat.mtime);
+        await this.setProvenance(file.path, baseRevision, readFile.stat.mtime, readFile.body);
         await this.queueConflictCheckFor(file.path);
         return true;
       }
@@ -316,7 +359,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
     if (storedRevision === false) {
       return false;
     }
-    await this.setProvenance(file.path, storedRevision, readFile.stat.mtime);
+    await this.setProvenance(file.path, storedRevision, readFile.stat.mtime, readFile.body);
     await this.queueConflictCheckFor(file.path);
     return true;
   }
@@ -359,7 +402,10 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
         observedProvenance,
         entry ? { _rev: entry._rev, data: readContent(entry) } : void 0
       );
-      if (retryIfStorageChanges && !await this.currentStorageSnapshotMatches(readFile, observedProvenance)) {
+      const upgradeCurrentRecord = classification.kind === "unchanged" && !isConflicted && classification.revision === currentEntry._rev && !hasContentHash(observedProvenance);
+      const evidence = upgradeCurrentRecord || classification.kind === "matching-leaf" && classification.revision ? await this.contentEvidence(readFile.body) : void 0;
+      const snapshotMatches = retryIfStorageChanges || upgradeCurrentRecord ? await this.currentStorageSnapshotMatches(readFile, observedProvenance) : true;
+      if (retryIfStorageChanges && !snapshotMatches) {
         return await this.retryCurrentStorage(file.path, preferredBasePath, snapshotRetry);
       }
       if (classification.kind === "unchanged") {
@@ -369,12 +415,15 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
           if (!entry) return false;
           return await this.dbToStorageCore(file.path, file);
         } else {
+          if (upgradeCurrentRecord && snapshotMatches) {
+            await this.setProvenance(file.path, classification.revision, readFile.stat.mtime, readFile.body, evidence);
+          }
           this.path.markChangesAreSame(readFile, readFile.stat.mtime, currentEntry.mtime);
         }
         return true;
       }
       if (classification.kind === "matching-leaf") {
-        await this.rememberMatchingLeaf(file.path, classification.revision, readFile.stat.mtime);
+        await this.rememberMatchingLeaf(file.path, classification.revision, readFile.stat.mtime, readFile.body, evidence);
         if (isConflicted) await this.queueConflictCheckFor(file.path);
         return true;
       }
@@ -384,7 +433,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
       if (retryIfStorageChanges && !await this.finaliseStoredRevision(readFile, observedProvenance, storedRevision2)) {
         return await this.retryCurrentStorage(file.path, preferredBasePath, snapshotRetry);
       }
-      if (!retryIfStorageChanges) await this.setProvenance(file.path, storedRevision2, readFile.stat.mtime);
+      if (!retryIfStorageChanges) await this.setProvenance(file.path, storedRevision2, readFile.stat.mtime, readFile.body);
       if (isConflicted || classification.kind === "unknown") await this.queueConflictCheckFor(file.path);
       return true;
     }
@@ -393,7 +442,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
       if (baseRevision) {
         const baseEntry = await this.db.fetchEntry(file, baseRevision, true, true);
         if (baseEntry && await isDocContentSame(getDocDataAsArray(baseEntry.data), readFile.body) && !force) {
-          await this.setProvenance(file.path, baseRevision, readFile.stat.mtime);
+          await this.setProvenance(file.path, baseRevision, readFile.stat.mtime, readFile.body);
           this._log(`File ${file.path} is not changed on its displayed conflict branch`, LOG_LEVEL_VERBOSE);
           return true;
         }
@@ -402,7 +451,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
         if (preferredBasePath && preferredBasePath !== file.path) {
           await this.deleteProvenance(preferredBasePath);
         }
-        await this.setProvenance(file.path, storedRevision3, readFile.stat.mtime);
+        await this.setProvenance(file.path, storedRevision3, readFile.stat.mtime, readFile.body);
         await this.queueConflictCheckFor(file.path);
         return true;
       }
@@ -425,7 +474,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
       if (preferredBasePath && preferredBasePath !== file.path) {
         await this.deleteProvenance(preferredBasePath);
       }
-      await this.setProvenance(file.path, storedRevision2, readFile.stat.mtime);
+      await this.setProvenance(file.path, storedRevision2, readFile.stat.mtime, readFile.body);
       await this.queueConflictCheckFor(file.path);
       return true;
     }
@@ -435,7 +484,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
       if (preferredBasePath && preferredBasePath !== file.path) {
         await this.deleteProvenance(preferredBasePath);
       }
-      await this.setProvenance(file.path, storedRevision2, readFile.stat.mtime);
+      await this.setProvenance(file.path, storedRevision2, readFile.stat.mtime, readFile.body);
       return true;
     }
     let shouldApplied = false;
@@ -451,7 +500,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
         }
       }
       if (!shouldApplied) {
-        await this.setProvenance(file.path, entry._rev, readFile.stat.mtime);
+        await this.setProvenance(file.path, entry._rev, readFile.stat.mtime, readFile.body);
         this._log(`File ${file.path} is not changed`, LOG_LEVEL_VERBOSE);
         return true;
       }
@@ -461,7 +510,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
     if (preferredBasePath && preferredBasePath !== file.path) {
       await this.deleteProvenance(preferredBasePath);
     }
-    await this.setProvenance(file.path, storedRevision, readFile.stat.mtime);
+    await this.setProvenance(file.path, storedRevision, readFile.stat.mtime, readFile.body);
     return true;
   }
   async deleteFileFromDB(info) {
@@ -813,20 +862,30 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
         );
         return false;
       }
-      if (getParentPath(existDoc.path) !== getParentPath(path)) {
-        this._log(
-          `Refusing to apply a filename case change across differently cased parent directories: ${existDoc.path} -> ${path}`,
-          LOG_LEVEL_NOTICE
-        );
-        return false;
-      }
-      const renamedFile = await this.storage.renameFile(existDoc, path);
-      if (!renamedFile) {
-        this._log(`Could not apply the stored filename case: ${existDoc.path} -> ${path}`, LOG_LEVEL_NOTICE);
-        return false;
+      const pathNormalizationVersion = getPathNormalizationVersion(settings);
+      const sameNormalisedPath = pathNormalizationVersion === 1 && normalisePathForIdentity(existDoc.path, pathNormalizationVersion) === normalisePathForIdentity(path, pathNormalizationVersion);
+      if (!sameNormalisedPath) {
+        const existingParent = getParentPath(existDoc.path);
+        const targetParent = getParentPath(path);
+        const sameNormalisedParent = pathNormalizationVersion === 1 && normalisePathForIdentity(existingParent, pathNormalizationVersion) === normalisePathForIdentity(targetParent, pathNormalizationVersion);
+        if (existingParent !== targetParent && !sameNormalisedParent) {
+          this._log(
+            `Refusing to apply a filename case change across differently cased parent directories: ${existDoc.path} -> ${path}`,
+            LOG_LEVEL_NOTICE
+          );
+          return false;
+        }
+        const renamedFile = await this.storage.renameFile(existDoc, path);
+        if (!renamedFile) {
+          this._log(
+            `Could not apply the stored filename case: ${existDoc.path} -> ${path}`,
+            LOG_LEVEL_NOTICE
+          );
+          return false;
+        }
+        await this.deleteProvenance(existDoc.path);
+        existDoc = renamedFile;
       }
-      await this.deleteProvenance(existDoc.path);
-      existDoc = renamedFile;
     }
     const docRead = await this.db.fetchEntryFromMeta(docEntry);
     if (!docRead) {
@@ -843,10 +902,12 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
       }
     }
     const docData = readContent(docRead);
+    const reflectedContent = readAsBlob(docRead);
+    const reflectedEvidence = await this.contentEvidence(reflectedContent);
     if (allowExistingConflicts && existDoc && !force) {
       const readFile = await this.readFileFromStub(existDoc);
       if (await isDocContentSame(docData, readFile.body)) {
-        await this.setProvenance(path, docEntry._rev, existDoc.stat.mtime);
+        await this.setProvenance(path, docEntry._rev, existDoc.stat.mtime, reflectedContent, reflectedEvidence);
         this.path.markChangesAreSame(docRead, docRead.mtime, existDoc.stat.mtime);
         return true;
       }
@@ -868,7 +929,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
         }
       }
       if (!shouldApplied) {
-        await this.setProvenance(path, docEntry._rev, existDoc.stat.mtime);
+        await this.setProvenance(path, docEntry._rev, existDoc.stat.mtime, reflectedContent, reflectedEvidence);
         this._log(`File ${docRead.path} is not changed`, LOG_LEVEL_VERBOSE);
         return true;
       }
@@ -913,10 +974,10 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
     this.storage.triggerFileEvent(mode, path);
     if (ret && this.fileReflectionProvenance) {
       const storedStat = await this.storage.stat(path);
-      if (safeSnapshot && await this.readProvenanceSnapshot(path) !== safeSnapshot.revision) {
+      if (safeSnapshot && !sameProvenance(await this.readProvenanceSnapshot(path), safeSnapshot.revision)) {
         return ret;
       }
-      await this.setProvenance(path, docEntry._rev, storedStat?.mtime);
+      await this.setProvenance(path, docEntry._rev, storedStat?.mtime, reflectedContent, reflectedEvidence);
     }
     return ret;
   }
@@ -954,7 +1015,7 @@ class ServiceFileHandlerBase extends ServiceModuleBase {
       return { preserved: false, snapshot };
     }
     if (classification.kind === "matching-leaf") {
-      await this.rememberMatchingLeaf(path, classification.revision, readFile.stat.mtime);
+      await this.rememberMatchingLeaf(path, classification.revision, readFile.stat.mtime, readFile.body);
       await this.queueConflictCheckFor(path);
       return { preserved: true };
     }

package/dist/services/base/IService.d.ts

@@ -60,13 +60,14 @@ export interface IAPIService {
 export interface IPathService {
     id2path(id: DocumentID, entry?: EntryHasPath, stripPrefix?: boolean): FilePathWithPrefix;
     path2id(filename: FilePathWithPrefix | FilePath, prefix?: string): Promise<DocumentID>;
-    path2idWithSettings(filename: FilePathWithPrefix | FilePath, setting: Pick<RemoteDBSettings, "encrypt" | "usePathObfuscation" | "passphrase" | "handleFilenameCaseSensitive" | "idDerivationVersion" | "idDerivationKey">, prefix?: string): Promise<DocumentID>;
+    path2idWithSettings(filename: FilePathWithPrefix | FilePath, setting: PathIDSettings, prefix?: string): Promise<DocumentID>;
     getPath(entry: AnyEntry): FilePathWithPrefix;
     markChangesAreSame(old: UXFileInfo | AnyEntry | FilePathWithPrefix, newMtime: number, oldMtime: number): boolean | undefined;
     unmarkChanges(file: AnyEntry | FilePathWithPrefix | UXFileInfoStub): void;
     compareFileFreshness(baseFile: UXFileInfoStub | AnyEntry | undefined, checkTarget: UXFileInfo | AnyEntry | undefined): typeof BASE_IS_NEW | typeof TARGET_IS_NEW | typeof EVEN;
     isMarkedAsSameChanges(file: UXFileInfoStub | AnyEntry | FilePathWithPrefix, mtimes: number[]): undefined | typeof EVEN;
 }
+export type PathIDSettings = Pick<RemoteDBSettings, "encrypt" | "usePathObfuscation" | "passphrase" | "handleFilenameCaseSensitive" | "idDerivationVersion" | "idDerivationKey"> & Partial<Pick<RemoteDBSettings, "pathNormalizationVersion">>;
 export interface openDatabaseParameters {
     replicator: ReplicatorService;
     databaseEvents: DatabaseEventService;

package/dist/services/base/PathService.d.ts

@@ -1,5 +1,5 @@
-import type { DocumentID, EntryHasPath, FilePathWithPrefix, FilePath, AnyEntry, RemoteDBSettings, UXFileInfo, UXFileInfoStub } from "../../common/types.js";
-import type { IPathService, ISettingService } from "./IService.js";
+import type { DocumentID, EntryHasPath, FilePathWithPrefix, FilePath, AnyEntry, UXFileInfo, UXFileInfoStub } from "../../common/types.js";
+import type { IPathService, ISettingService, PathIDSettings } from "./IService.js";
 import { ServiceBase, type ServiceContext } from "./ServiceBase.js";
 import type { BASE_IS_NEW, EVEN, TARGET_IS_NEW } from "../../common/models/shared.const.symbols.js";
 export interface PathServiceDependencies {
@@ -37,7 +37,7 @@ export declare abstract class PathService<T extends ServiceContext = ServiceCont
      */
     path2id(filename: FilePathWithPrefix | FilePath, prefix?: string): Promise<DocumentID>;
     /** Convert a path using the caller's settings snapshot and this host's path normalisation. */
-    path2idWithSettings(filename: FilePathWithPrefix | FilePath, setting: Pick<RemoteDBSettings, "encrypt" | "usePathObfuscation" | "passphrase" | "handleFilenameCaseSensitive" | "idDerivationVersion" | "idDerivationKey">, prefix?: string): Promise<DocumentID>;
+    path2idWithSettings(filename: FilePathWithPrefix | FilePath, setting: PathIDSettings, prefix?: string): Promise<DocumentID>;
     getPath(entry: AnyEntry): FilePathWithPrefix;
     abstract markChangesAreSame(old: UXFileInfo | AnyEntry | FilePathWithPrefix, newMtime: number, oldMtime: number): boolean | undefined;
     abstract unmarkChanges(file: AnyEntry | FilePathWithPrefix | UXFileInfoStub): void;

package/dist/services/base/PathService.js

@@ -1,3 +1,4 @@
+import { getPathNormalizationVersion, normalisePathForIdentity } from "../../common/pathNormalization.js";
 import { ServiceBase } from "./ServiceBase.js";
 import { addPrefix, expandFilePathPrefix, id2path_base, path2id_base } from "../../string_and_binary/path.js";
 import { configuredIdKey } from "../../common/idDerivation.js";
@@ -18,9 +19,9 @@ class PathService extends ServiceBase {
     const [prefix, path] = expandFilePathPrefix(filename);
     return prefix + this.normalizePath(path);
   }
-  async _path2id(filename, obfuscatePassphrase, caseInsensitive, idDerivationKey) {
+  async _path2id(filename, obfuscatePassphrase, caseInsensitive, idDerivationKey, pathNormalizationVersion) {
     const [prefix, path] = expandFilePathPrefix(filename);
-    const fixedPath = prefix + this.normalizePath(path);
+    const fixedPath = prefix + normalisePathForIdentity(this.normalizePath(path), pathNormalizationVersion);
     const out = await path2id_base(fixedPath, obfuscatePassphrase, caseInsensitive, idDerivationKey);
     return out;
   }
@@ -49,13 +50,15 @@ class PathService extends ServiceBase {
   }
   /** Convert a path using the caller's settings snapshot and this host's path normalisation. */
   async path2idWithSettings(filename, setting, prefix) {
+    const pathNormalizationVersion = getPathNormalizationVersion(setting);
     const destPath = addPrefix(filename, prefix ?? "");
     const pathObfuscationPassphrase = this.getPathObfuscationPassphrase?.() ?? (setting.usePathObfuscation ? setting.passphrase : false);
     return await this._path2id(
       destPath,
       pathObfuscationPassphrase,
       !setting.handleFilenameCaseSensitive,
-      setting.encrypt && configuredIdKey(setting) || void 0
+      setting.encrypt && configuredIdKey(setting) || void 0,
+      pathNormalizationVersion
     );
   }
   getPath(entry) {

package/dist/settings.d.ts

@@ -7,6 +7,8 @@ export { DEFAULT_SETTINGS, NEW_VAULT_SETTINGS, P2P_DEFAULT_SETTINGS, SETTINGS_SC
 export { PREFERRED_BASE, PREFERRED_JOURNAL_SYNC, PREFERRED_SETTING_CLOUDANT, PREFERRED_SETTING_SELF_HOSTED, } from "./common/models/setting.const.preferred.js";
 export { CURRENT_SETTING_VERSION } from "./common/models/setting.const.js";
 export { deriveIdKey, deriveOrImportIdKey, formatIdRecoveryCode, configuredIdKey, ID_DERIVATION_VERSION, ID_RECOVERY_CODE_PREFIX, } from "./common/idDerivation.js";
+export { getPathNormalizationVersion, normalisePathForIdentity } from "./common/pathNormalization.js";
+export type { PathNormalizationVersion, PathIdentitySettings } from "./common/models/setting.type.js";
 export { prepareSettingsForLoad, SettingsMigrationReviewCodes, type PreparedSettings, type SettingsMigrationReviewCode, type SettingsMigrationReviewReason, type SettingsMigrationState, } from "./common/models/setting.lifecycle.js";
 export { assessTweakCompatibility } from "./common/models/tweak.compatibility.js";
 export type { TweakAssessment, TweakAssessmentEntry, TweakAssessmentRelation, TweakAssessmentValue, TweakTransition, TweakTransitionReason, } from "./common/models/tweak.compatibility.js";

package/dist/settings.js

@@ -20,6 +20,7 @@ import {
   ID_DERIVATION_VERSION,
   ID_RECOVERY_CODE_PREFIX
 } from "./common/idDerivation.js";
+import { getPathNormalizationVersion, normalisePathForIdentity } from "./common/pathNormalization.js";
 import {
   prepareSettingsForLoad,
   SettingsMigrationReviewCodes
@@ -53,6 +54,8 @@ export {
   deriveIdKey,
   deriveOrImportIdKey,
   formatIdRecoveryCode,
+  getPathNormalizationVersion,
   mergeMarkdownSettings,
+  normalisePathForIdentity,
   prepareSettingsForLoad
 };