sliftutils 1.7.1 → 1.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sliftutils",
-    "version": "1.7.1",
+    "version": "1.7.3",
     "main": "index.js",
     "license": "MIT",
     "files": [
@@ -57,7 +57,7 @@
         "preact-old-types": "^10.28.1",
         "shell-quote": "^1.8.3",
         "socket-function": "^1.2.4",
-        "typenode": "^6.6.0",
+        "typenode": "^6.6.1",
         "typesafecss": "*",
         "ws": "^8.18.3",
         "yargs": "15.4.1"

package/storage/BulkDatabase2/LoadedIndex.ts

@@ -5,6 +5,9 @@ import { STREAM_EXTENSION, StreamEntry, parseStream, streamReaderFromEntries } f
 import { formatNumber, formatTime } from "socket-function/src/formatting/format";
 import { blue, red } from "socket-function/src/formatting/logColors";
 
+// Duplicated from BulkDatabaseBase to avoid a circular import — used only to build a fuller storage-relative path for log messages.
+const BULK_ROOT_FOLDER = "bulkDatabases2";
+
 export type BulkFileInfo = { fileName: string; level: number; timestamp: number };
 export type StreamFileInfo = { fileName: string; timestamp: number };
 export type StreamReaderCacheEntry = { readSize: number; parsedPos: number; entries: StreamEntry[] };
@@ -257,7 +260,7 @@ export async function loadFileReader(name: string, storage: FileStorage, f: Bulk
     const raw = await makeRawGetRange(storage, f.fileName);
     const fileId = nullJoin(name, f.fileName);
     const opened = await blockCache.open(fileId, raw.size, raw.rawGetRange);
-    const reader = await loadBulkDatabase({ totalBytes: opened.uncompressedSize, getRange: opened.getRange, name: f.fileName });
+    const reader = await loadBulkDatabase({ totalBytes: opened.uncompressedSize, getRange: opened.getRange, name: `${BULK_ROOT_FOLDER}/${name}/${f.fileName}` });
     cache.set(f.fileName, reader);
     return reader;
 }
@@ -333,11 +336,11 @@ function pruneSubCaches(bulkFiles: BulkFileInfo[], streamFiles: StreamFileInfo[]
 // visible without flooding the log on every rebuild.
 const warnedCorruptReads = new Set<string>();
 function warnCorruptRead(db: BaseBulkDatabaseReader, column: string, e: unknown): void {
-    const fileName = db.name || "(unknown source)";
-    const dedupeKey = nullJoin(fileName, column);
+    const path = db.name || "(unknown source)";
+    const dedupeKey = nullJoin(path, column);
     if (warnedCorruptReads.has(dedupeKey)) return;
     warnedCorruptReads.add(dedupeKey);
-    console.warn(`${red("corrupt read")}: file ${fileName} column ${JSON.stringify(column)} could not be read - skipping it (its data is dropped from results): ${(e as Error).message}`);
+    console.warn(`${red("corrupt read")}: file ${path} column ${JSON.stringify(column)} could not be read - skipping it (its data is dropped from results): ${(e as Error).message}`);
 }
 
 function joinBulkDatabases(databases: BaseBulkDatabaseReader[]): ResolvedReader {

package/yarn.lock

@@ -2095,10 +2095,10 @@ typenode@^6.0.1:
     source-map-support "https://github.com/7rulnik/node-source-map-support"
     typescript "5.3.3"
 
-typenode@^6.6.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/typenode/-/typenode-6.6.0.tgz#862f2fd0d0fcbf6ed61d07015e8dfe769cf0adec"
-  integrity sha512-ReDna13iuEVZ9nRdJwdhxSvtR2lWv60QWiEEhp+fj/uhXOKSn5S7IVe5qlYmp8DSLw50qxQ0IUNlNVrIauNldg==
+typenode@^6.6.1:
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/typenode/-/typenode-6.6.1.tgz#a7236a618bca1e2dc8c7126ddf303349388a7a38"
+  integrity sha512-gFvy6F3dUE7WivTDrtZvgKH5aRrDORXeO2+4RtSVf3k4SKTHHUlh8wvsMi6aE9hYOgjmb9X03fKDvUDlC9T4PA==
   dependencies:
     "@types/pegjs" "^0.10.3"
     source-map-support "https://github.com/7rulnik/node-source-map-support"