wiki-graph-sdk 0.9.0 → 0.9.2

package/dist/conversions.js

@@ -115,6 +115,15 @@ var NodeFile = class {
     this.name = name;
   }
   path;
+  async getPhysicalIdentity() {
+    const value = await fsPromises.stat(this.path).catch((error) => {
+      if (typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT")
+        return void 0;
+      throw error;
+    });
+    if (value === void 0) return void 0;
+    return `${value.dev}:${value.ino}`;
+  }
   kind = "file";
   [NODE_RESOURCE_KIND] = "file";
   identity;
@@ -239,6 +248,15 @@ var NodeDirectory = class _NodeDirectory {
     this.name = pathModule.basename(path);
   }
   path;
+  async getPhysicalIdentity() {
+    const value = await fsPromises.stat(this.path).catch((error) => {
+      if (typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT")
+        return void 0;
+      throw error;
+    });
+    if (value === void 0) return void 0;
+    return `${value.dev}:${value.ino}`;
+  }
   kind = "directory";
   [NODE_RESOURCE_KIND] = "directory";
   identity;
@@ -248,8 +266,10 @@ var NodeDirectory = class _NodeDirectory {
     const file = new NodeFile(pathModule.join(this.path, name));
     try {
       return (await fsPromises.stat(file.path)).isFile() ? file : void 0;
-    } catch {
-      return void 0;
+    } catch (error) {
+      if (typeof error === "object" && error !== null && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR"))
+        return void 0;
+      throw error;
     }
   }
   async getLastModified() {
@@ -267,8 +287,10 @@ var NodeDirectory = class _NodeDirectory {
     const directory = new _NodeDirectory(pathModule.join(this.path, name));
     try {
       return (await fsPromises.stat(directory.path)).isDirectory() ? directory : void 0;
-    } catch {
-      return void 0;
+    } catch (error) {
+      if (typeof error === "object" && error !== null && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR"))
+        return void 0;
+      throw error;
     }
   }
   async list() {
@@ -392,14 +414,23 @@ async function openNativeNodeDatabase(file, flags) {
     });
   });
 }
-async function openNodeZip(file) {
+async function openNodeZip(file, options = {}) {
   const path = getBrandedNodeResourcePath(file, "file");
   if (path === void 0) {
     throw new TypeError("The Node ZIP adapter requires a NodeFile");
   }
-  const zipFile = await new Promise((resolve4, reject) => {
-    yauzl.open(
-      path,
+  const handle = await fsPromises.open(path, "r");
+  let size;
+  try {
+    size = (await handle.stat()).size;
+  } catch (error) {
+    await handle.close();
+    throw error;
+  }
+  const open2 = () => new Promise((resolve4, reject) => {
+    yauzl.fromRandomAccessReader(
+      new NodeZipSource(handle),
+      size,
       { autoClose: false, lazyEntries: true },
       (error, opened) => {
         if (error || opened === void 0)
@@ -408,63 +439,192 @@ async function openNodeZip(file) {
       }
     );
   });
-  const entries = await new Promise(
-    (resolve4, reject) => {
-      const discovered = /* @__PURE__ */ new Map();
-      const rejectAndClose = (error) => {
-        zipFile.close();
-        reject(
-          error instanceof Error ? error : new Error("Cannot scan ZIP central directory")
-        );
-      };
-      const resolveEntries = () => {
-        zipFile.off("error", rejectAndClose);
-        resolve4(discovered);
-      };
-      zipFile.on("entry", (entry) => {
-        if (!entry.fileName.endsWith("/")) {
-          discovered.set(entry.fileName, entry);
-        }
-        zipFile.readEntry();
-      });
-      zipFile.once("error", rejectAndClose);
-      zipFile.once("end", resolveEntries);
-      zipFile.readEntry();
-    }
-  );
+  try {
+    (await open2()).close();
+  } catch (error) {
+    await handle.close();
+    throw error;
+  }
   let closed = false;
+  let pending = Promise.resolve();
+  let closing;
+  const run = (operation) => {
+    if (closed)
+      return Promise.reject(new Error("Cannot read a closed ZIP archive"));
+    const result = pending.then(async () => {
+      const zip = await open2();
+      try {
+        return await operation(zip);
+      } finally {
+        zip.close();
+      }
+    });
+    pending = result.then(
+      () => void 0,
+      () => void 0
+    );
+    return result;
+  };
+  const withEntry = (name, operation) => run(async (zip) => {
+    let exact;
+    let alias;
+    let aliasCollision = false;
+    await scanNodeZip(zip, (entry) => {
+      if (entry.fileName === name) exact = entry;
+      if (normalizeNodeZipName(entry.fileName) === name) {
+        if (alias !== void 0 && alias.fileName !== entry.fileName)
+          aliasCollision = true;
+        alias = entry;
+      }
+    });
+    if ((exact === void 0 || options.entryNameMode === "normalized") && aliasCollision) {
+      let bestPosition = -1;
+      const candidates = await open2();
+      try {
+        await scanNodeZip(candidates, async (entry) => {
+          if (normalizeNodeZipName(entry.fileName) !== name) return;
+          const probe = await open2();
+          let position = 0;
+          try {
+            await scanNodeZip(probe, (candidate) => {
+              if (candidate.fileName === entry.fileName) return false;
+              position++;
+            });
+          } finally {
+            probe.close();
+          }
+          if (position >= bestPosition) {
+            bestPosition = position;
+            alias = entry;
+          }
+        });
+        return await operation(candidates, alias);
+      } finally {
+        candidates.close();
+      }
+    }
+    return await operation(
+      zip,
+      options.entryNameMode === "normalized" ? alias : exact ?? alias
+    );
+  });
   return {
     close: () => {
-      if (!closed) zipFile.close();
       closed = true;
-      return Promise.resolve();
+      closing ??= pending.then(() => handle.close());
+      return closing;
     },
-    copyEntry: async (name, target) => {
-      if (closed) throw new Error("Cannot read a closed ZIP archive");
-      const entry = entries.get(name);
+    copyEntry: (name, target) => withEntry(name, async (zip, entry) => {
       if (entry === void 0) return false;
-      await copyNodeZipEntry(zipFile, entry, target);
+      await copyNodeZipEntry(zip, entry, target);
       return true;
-    },
-    getEntrySize: (name) => {
-      if (closed) throw new Error("Cannot read a closed ZIP archive");
-      return Promise.resolve(entries.get(name)?.uncompressedSize);
-    },
-    listEntries: () => Promise.resolve([...entries.keys()]),
-    readEntryRange: async (name, offset, length) => {
-      if (closed) throw new Error("Cannot read a closed ZIP archive");
-      const entry = entries.get(name);
+    }),
+    getEntrySize: (name) => withEntry(
+      name,
+      (_zip, entry) => Promise.resolve(entry?.uncompressedSize)
+    ),
+    listEntries: () => run(async (zip) => {
+      const names = /* @__PURE__ */ new Set();
+      await scanNodeZip(zip, (entry) => {
+        names.add(entry.fileName);
+      });
+      return [...names];
+    }),
+    readEntryRange: (name, offset, length) => withEntry(name, async (zip, entry) => {
       if (entry === void 0) return void 0;
-      return await readNodeZipEntryRange(zipFile, entry, offset, length);
-    },
-    readEntry: async (name) => {
-      if (closed) throw new Error("Cannot read a closed ZIP archive");
-      const entry = entries.get(name);
+      return await readNodeZipEntryRange(zip, entry, offset, length);
+    }),
+    readEntry: (name) => withEntry(name, async (zip, entry) => {
       if (entry === void 0) return void 0;
-      return await readNodeZipEntry(zipFile, entry);
-    }
+      return await readNodeZipEntry(zip, entry);
+    })
   };
 }
+var NodeZipSource = class extends yauzl.RandomAccessReader {
+  constructor(handle) {
+    super();
+    this.handle = handle;
+  }
+  handle;
+  read(buffer, offset, length, position, callback) {
+    const read2 = (written) => {
+      if (written === length) {
+        callback(null);
+        return;
+      }
+      fs.read(
+        this.handle.fd,
+        buffer,
+        offset + written,
+        length - written,
+        position + written,
+        (error, bytesRead) => {
+          if (error) callback(error);
+          else if (bytesRead === 0)
+            callback(new Error("Unexpected end of ZIP file"));
+          else read2(written + bytesRead);
+        }
+      );
+    };
+    read2(0);
+  }
+  _readStreamForRange(start, end) {
+    const handle = this.handle;
+    return Readable.from(
+      (async function* () {
+        for (let position = start; position < end; ) {
+          const buffer = Buffer.allocUnsafe(
+            Math.min(64 * 1024, end - position)
+          );
+          const { bytesRead } = await handle.read(
+            buffer,
+            0,
+            buffer.length,
+            position
+          );
+          if (bytesRead === 0) return;
+          position += bytesRead;
+          yield buffer.subarray(0, bytesRead);
+        }
+      })()
+    );
+  }
+};
+function normalizeNodeZipName(name) {
+  const normalized = name.replaceAll("\\", "/").trim().split("/").filter((part) => part !== "" && part !== ".").join("/");
+  return normalized.split("/").includes("..") ? void 0 : normalized;
+}
+async function scanNodeZip(zip, visit) {
+  await new Promise((resolve4, reject) => {
+    const cleanup = () => {
+      zip.off("entry", onEntry);
+      zip.off("end", onEnd);
+      zip.off("error", onError);
+    };
+    const onError = (error) => {
+      cleanup();
+      reject(error);
+    };
+    const onEnd = () => {
+      cleanup();
+      resolve4();
+    };
+    const onEntry = (entry) => {
+      void Promise.resolve().then(() => entry.fileName.endsWith("/") ? void 0 : visit(entry)).then((keepReading) => {
+        if (keepReading === false) onEnd();
+        else zip.readEntry();
+      }).catch(
+        (error) => onError(
+          error instanceof Error ? error : new Error("Cannot scan ZIP", { cause: error })
+        )
+      );
+    };
+    zip.on("entry", onEntry);
+    zip.once("end", onEnd);
+    zip.once("error", onError);
+    zip.readEntry();
+  });
+}
 async function copyNodeZipEntry(zipFile, entry, target) {
   const writer = await target.openWriter();
   try {
@@ -1235,17 +1395,29 @@ function resolveWikiGraphRuntimePath(path) {
 
 // src/archive/target.ts
 import { realpath, stat as stat2 } from "fs/promises";
-import { basename as basename2, dirname as dirname2, isAbsolute as isAbsolute3, join as join3, relative, resolve as resolve3 } from "path";
+import { basename as basename2, dirname as dirname2, join as join3, resolve as resolve3 } from "path";
 import {
   formatLocatedWikiGraphUri,
   formatWikiGraphLibraryUri,
-  listWikiGraphLibraries,
-  listWikiGraphLibraryArchives,
+  findWikiGraphLibraryByPhysicalIdentity,
+  findWikiGraphLibraryArchivePhysicalAliases,
   parseLocatedWikiGraphUri,
   parseWikiGraphLibraryUri,
   resolveWikiGraphLibrary,
-  resolveWikiGraphLibraryArchiveFile
+  resolveWikiGraphLibraryArchiveFile,
+  isWikiGraphSchemaVersionError,
+  WikiGraphSchemaVersionError
 } from "wiki-graph-core";
+function rethrowArchiveSchemaError(error, target) {
+  if (isWikiGraphSchemaVersionError(error) && error.target.kind === "archive") {
+    throw new WikiGraphSchemaVersionError(
+      target.kind === "standalone" ? { kind: "archive", path: resolveWikiGraphRuntimePath(target.path) } : { kind: "library", uri: target.uri.split("/arc/")[0] },
+      error.actualVersion,
+      error.supportedVersion
+    );
+  }
+  throw error;
+}
 var WikiGraphArchiveOwnershipError = class extends Error {
   code = "WIKI_GRAPH_ARCHIVE_OWNERSHIP_MISMATCH";
   constructor(message) {
@@ -1257,12 +1429,7 @@ async function assertStandaloneWikiGraphArchivePath(inputPath) {
   const path = resolveWikiGraphRuntimePath(inputPath);
   const candidate = await canonicalPath(path);
   const candidateIdentity = await readFileIdentity(path);
-  const libraries = await listWikiGraphLibraries();
-  const matches = await findMatchingMembers(
-    libraries,
-    candidate,
-    candidateIdentity
-  );
+  const matches = await findMatchingMembers(candidate, candidateIdentity);
   if (matches.length > 0) {
     const match = requireUnambiguousManagedMatch(path, matches);
     throw new WikiGraphArchiveOwnershipError(
@@ -1271,63 +1438,61 @@ async function assertStandaloneWikiGraphArchivePath(inputPath) {
       )}: ${path}. Use the library UUID URI ${match.archive.uri} instead.`
     );
   }
-  for (const library of libraries) {
-    const rootPath = getNodeResourcePath(library.folder);
-    const root = await canonicalPath(rootPath);
-    if (!isWithin(root, candidate)) continue;
-    throw new WikiGraphArchiveOwnershipError(
-      `Standalone archive path belongs to registered library ${formatWikiGraphLibraryUri(
-        library.isDefault ? void 0 : library.publicId
-      )}: ${path}. Scan the library, then address the archive by its library UUID URI.`
+  const ancestors = /* @__PURE__ */ new Set();
+  for (const start of [candidate, resolve3(path)]) {
+    for (let parent = dirname2(start); ; parent = dirname2(parent)) {
+      ancestors.add(parent);
+      if (dirname2(parent) === parent) break;
+    }
+  }
+  for (const parent of ancestors) {
+    const identity = await readFileIdentity(parent);
+    const library = await findWikiGraphLibraryByPhysicalIdentity(
+      identity,
+      new NodeDirectory(parent).identity
     );
+    if (library !== void 0) {
+      throw new WikiGraphArchiveOwnershipError(
+        `Standalone archive path belongs to registered library ${formatWikiGraphLibraryUri(
+          library.isDefault ? void 0 : library.publicId
+        )}: ${path}. Scan the library, then address the archive by its library UUID URI.`
+      );
+    }
   }
   return path;
 }
 async function canonicalPath(path) {
   try {
     return await realpath(path);
-  } catch {
+  } catch (error) {
+    if (!(typeof error === "object" && error !== null && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR")))
+      throw error;
     const absolute = resolve3(path);
     const parent = dirname2(absolute);
     return parent === absolute ? absolute : join3(await canonicalPath(parent), basename2(absolute));
   }
 }
-function isWithin(root, candidate) {
-  const child = relative(root, candidate);
-  return child === "" || !child.startsWith("..") && !isAbsolute3(child);
-}
-async function findMatchingMembers(libraries, candidate, candidateIdentity) {
+async function findMatchingMembers(candidate, candidateIdentity) {
+  if (candidateIdentity === void 0) return [];
+  const archives = await findWikiGraphLibraryArchivePhysicalAliases(candidateIdentity);
   const members = [];
-  for (const library of libraries) {
-    const archives = await listWikiGraphLibraryArchives({
-      isDefault: library.isDefault,
-      kind: "scope",
-      ...library.isDefault ? {} : { publicId: library.publicId }
-    });
-    for (const archive of archives) {
-      const physical = archive.file ?? archive.directory;
-      if (physical === void 0) continue;
+  for (const archive of archives) {
+    const parsed = parseWikiGraphLibraryUri(archive.libraryUri);
+    const library = await resolveWikiGraphLibrary(parsed);
+    const physical = archive.file ?? archive.directory;
+    if (library !== void 0 && physical !== void 0)
       members.push({
         archive,
         library,
         memberPath: getNodeResourcePath(physical)
       });
-    }
   }
   const exact = [];
   for (const member of members) {
-    if (await canonicalPath(member.memberPath) === candidate) {
+    if (await canonicalPath(member.memberPath) === candidate)
       exact.push(member);
-    }
-  }
-  if (exact.length > 0 || candidateIdentity === void 0) return exact;
-  const identityMatches = [];
-  for (const member of members) {
-    if (await readFileIdentity(member.memberPath) === candidateIdentity) {
-      identityMatches.push(member);
-    }
   }
-  return identityMatches;
+  return exact.length > 0 ? exact : members;
 }
 function requireUnambiguousManagedMatch(path, matches) {
   if (matches.length === 1) return matches[0];
@@ -1339,8 +1504,10 @@ async function readFileIdentity(path) {
   try {
     const value = await stat2(path);
     return `${value.dev}:${value.ino}`;
-  } catch {
-    return void 0;
+  } catch (error) {
+    if (typeof error === "object" && error !== null && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR"))
+      return void 0;
+    throw error;
   }
 }
 
@@ -1402,11 +1569,15 @@ var WikiGraphConversionManager = class {
       if (!("path" in options.input)) {
         throw new Error("wikg input requires a file path.");
       }
+      const inputPath = options.input.path;
       await app.openSession(
-        new NodeFile(
-          await assertStandaloneWikiGraphArchivePath(options.input.path)
-        ),
+        new NodeFile(await assertStandaloneWikiGraphArchivePath(inputPath)),
         write
+      ).catch(
+        (error) => rethrowArchiveSchemaError(error, {
+          kind: "standalone",
+          path: inputPath
+        })
       );
     } else if ("stream" in options.input) {
       await app.digestTextStreamSession(