@vrtmrz/livesync-commonlib 0.3.0 → 0.3.1

package/dist/string_and_binary/path.js

@@ -1,3 +1,4 @@
+import { splitPathNamespace } from "../common/pathNamespace.js";
 import { Minimatch } from "minimatch";
 import { getWebCrypto } from "../mods.js";
 import {
@@ -13,7 +14,7 @@ import {
 import { memorizeFuncWithLRUCache } from "../common/utils.js";
 import { uint8ArrayToHexString, writeString } from "./convert.js";
 import { unique } from "octagonal-wheels/collection.js";
-import { CHeader, ICHeader, ICXHeader, PSCHeader } from "../common/models/fileaccess.const.js";
+import { CHeader } from "../common/models/fileaccess.const.js";
 import { computeKeyedId } from "../common/idDerivation.js";
 function isValidFilenameInWidows(filename) {
   const regex = /[\u0000-\u001f]|[\\":?<>|*#]/g;
@@ -45,12 +46,8 @@ function addPrefix(path, prefix) {
   return `${prefix ?? ""}${path}`;
 }
 function expandFilePathPrefix(path) {
-  for (const prefix of [ICHeader, ICXHeader, PSCHeader]) {
-    if (path.startsWith(prefix)) {
-      return [prefix, path.substring(prefix.length)];
-    }
-  }
-  return ["", path];
+  const [prefix, body] = splitPathNamespace(path);
+  return [prefix, body];
 }
 function expandDocumentIDPrefix(id) {
   for (const prefix of [CHeader, PREFIX_OBFUSCATED]) {