tina4-nodejs 3.13.141 → 3.13.142

package/packages/orm/dist/index.js

@@ -10361,6 +10361,21 @@ var init_portTakeover = __esm({
   }
 });
 
+// ../core/src/etag.ts
+function etagMatches(ifNoneMatch, etag) {
+  const strip = (tag) => tag.trim().replace(/^W\//, "");
+  const target = strip(etag);
+  return ifNoneMatch.split(",").some((candidate) => {
+    const trimmed = candidate.trim();
+    return trimmed === "*" || strip(trimmed) === target;
+  });
+}
+var init_etag = __esm({
+  "../core/src/etag.ts"() {
+    "use strict";
+  }
+});
+
 // ../core/src/sessionHandlers/syncBridge.ts
 import { Worker } from "node:worker_threads";
 function getBridge(key, workerSource, workerData) {
@@ -10642,42 +10657,35 @@ var init_respClient = __esm({
   }
 });
 
-// ../core/src/sessionHandlers/valkeyHandler.ts
-var ValkeySessionHandler;
-var init_valkeyHandler = __esm({
-  "../core/src/sessionHandlers/valkeyHandler.ts"() {
+// ../core/src/sessionHandlers/respSessionHandler.ts
+var RespSessionHandler;
+var init_respSessionHandler = __esm({
+  "../core/src/sessionHandlers/respSessionHandler.ts"() {
     "use strict";
     init_respClient();
-    ValkeySessionHandler = class {
-      host;
-      port;
-      password;
-      prefix;
-      db;
-      constructor(config) {
-        this.host = config?.host ?? process.env.TINA4_SESSION_VALKEY_HOST ?? "127.0.0.1";
-        this.port = config?.port ?? (process.env.TINA4_SESSION_VALKEY_PORT ? parseInt(process.env.TINA4_SESSION_VALKEY_PORT, 10) : 6379);
-        this.password = config?.password ?? process.env.TINA4_SESSION_VALKEY_PASSWORD ?? "";
-        this.prefix = config?.prefix ?? process.env.TINA4_SESSION_VALKEY_PREFIX ?? "tina4:session:";
-        this.db = config?.db ?? (process.env.TINA4_SESSION_VALKEY_DB ? parseInt(process.env.TINA4_SESSION_VALKEY_DB, 10) : 0);
+    RespSessionHandler = class {
+      constructor(conn, label) {
+        this.conn = conn;
+        this.label = label;
       }
+      conn;
+      label;
       /**
-       * Execute a RESP command synchronously against the live Valkey server.
+       * Execute a RESP command synchronously against the live server.
        *
-       * Delegates to the shared {@link respCommandSync} transport: a genuine key miss
-       * yields `""`, and a transport/connection FAILURE (server unreachable, rejected
-       * AUTH, timeout) THROWS so the Session boundary can distinguish "not found"
-       * (silent) from "backend failed" (log-loud + degrade). Backend-failure parity.
+       * Delegates to the shared {@link respCommandSync} transport: a genuine key
+       * miss yields `""`, and a transport/connection FAILURE THROWS so the caller
+       * can distinguish "not found" from "backend failed". Backend-failure parity.
        */
       execSync(args) {
         return respCommandSync(
-          { host: this.host, port: this.port, password: this.password, db: this.db },
+          { host: this.conn.host, port: this.conn.port, password: this.conn.password, db: this.conn.db },
           args,
-          "Valkey"
+          this.label
         );
       }
       key(sessionId) {
-        return `${this.prefix}${sessionId}`;
+        return `${this.conn.prefix}${sessionId}`;
       }
       read(sessionId) {
         const raw = this.execSync(["GET", this.key(sessionId)]);
@@ -10688,7 +10696,7 @@ var init_valkeyHandler = __esm({
           return null;
         }
       }
-      write(sessionId, data, ttl) {
+      write(sessionId, data, ttl = 0) {
         const json = JSON.stringify(data);
         if (ttl > 0) {
           this.execSync(["SETEX", this.key(sessionId), String(ttl), json]);
@@ -10703,6 +10711,29 @@ var init_valkeyHandler = __esm({
   }
 });
 
+// ../core/src/sessionHandlers/valkeyHandler.ts
+var ValkeySessionHandler;
+var init_valkeyHandler = __esm({
+  "../core/src/sessionHandlers/valkeyHandler.ts"() {
+    "use strict";
+    init_respSessionHandler();
+    ValkeySessionHandler = class extends RespSessionHandler {
+      constructor(config) {
+        super(
+          {
+            host: config?.host ?? process.env.TINA4_SESSION_VALKEY_HOST ?? "127.0.0.1",
+            port: config?.port ?? (process.env.TINA4_SESSION_VALKEY_PORT ? parseInt(process.env.TINA4_SESSION_VALKEY_PORT, 10) : 6379),
+            password: config?.password ?? process.env.TINA4_SESSION_VALKEY_PASSWORD ?? "",
+            prefix: config?.prefix ?? process.env.TINA4_SESSION_VALKEY_PREFIX ?? "tina4:session:",
+            db: config?.db ?? (process.env.TINA4_SESSION_VALKEY_DB ? parseInt(process.env.TINA4_SESSION_VALKEY_DB, 10) : 0)
+          },
+          "Valkey"
+        );
+      }
+    };
+  }
+});
+
 // ../core/src/sessionHandlers/memcachedHandler.ts
 import { createHash as createHash4 } from "node:crypto";
 var MAX_KEY_BYTES, MAX_RELATIVE_EXPTIME, MemcachedSessionHandler;
@@ -11768,7 +11799,7 @@ var init_session = __esm({
     "use strict";
     init_logger();
     init_dotenv();
-    init_respClient();
+    init_respSessionHandler();
     init_valkeyHandler();
     init_memcachedHandler();
     init_mongoHandler();
@@ -11894,57 +11925,19 @@ var init_session = __esm({
         }
       }
     };
-    RedisSessionHandler = class {
-      host;
-      port;
-      password;
-      prefix;
-      db;
+    RedisSessionHandler = class extends RespSessionHandler {
       constructor(config) {
-        this.host = config?.redisHost ?? process.env.TINA4_SESSION_REDIS_HOST ?? "127.0.0.1";
-        this.port = config?.redisPort ?? (process.env.TINA4_SESSION_REDIS_PORT ? parseInt(process.env.TINA4_SESSION_REDIS_PORT, 10) : 6379);
-        this.password = config?.redisPassword ?? process.env.TINA4_SESSION_REDIS_PASSWORD ?? "";
-        this.prefix = config?.redisPrefix ?? process.env.TINA4_SESSION_REDIS_PREFIX ?? "tina4:session:";
-        this.db = config?.redisDb ?? (process.env.TINA4_SESSION_REDIS_DB ? parseInt(process.env.TINA4_SESSION_REDIS_DB, 10) : 0);
-      }
-      /**
-       * Execute a Redis command synchronously against the live server.
-       *
-       * Delegates to the shared {@link respCommandSync} transport: a genuine key miss
-       * yields `""`, and a transport/connection FAILURE (server unreachable, rejected
-       * AUTH, timeout) THROWS so the Session boundary can distinguish "not found"
-       * (silent) from "backend failed" (log-loud + degrade). Backend-failure parity.
-       */
-      execSync(args) {
-        return respCommandSync(
-          { host: this.host, port: this.port, password: this.password, db: this.db },
-          args,
+        super(
+          {
+            host: config?.redisHost ?? process.env.TINA4_SESSION_REDIS_HOST ?? "127.0.0.1",
+            port: config?.redisPort ?? (process.env.TINA4_SESSION_REDIS_PORT ? parseInt(process.env.TINA4_SESSION_REDIS_PORT, 10) : 6379),
+            password: config?.redisPassword ?? process.env.TINA4_SESSION_REDIS_PASSWORD ?? "",
+            prefix: config?.redisPrefix ?? process.env.TINA4_SESSION_REDIS_PREFIX ?? "tina4:session:",
+            db: config?.redisDb ?? (process.env.TINA4_SESSION_REDIS_DB ? parseInt(process.env.TINA4_SESSION_REDIS_DB, 10) : 0)
+          },
           "Redis"
         );
       }
-      key(sessionId) {
-        return `${this.prefix}${sessionId}`;
-      }
-      read(sessionId) {
-        const raw = this.execSync(["GET", this.key(sessionId)]);
-        if (!raw) return null;
-        try {
-          return JSON.parse(raw);
-        } catch {
-          return null;
-        }
-      }
-      write(sessionId, data, ttl = 0) {
-        const json = JSON.stringify(data);
-        if (ttl > 0) {
-          this.execSync(["SETEX", this.key(sessionId), String(ttl), json]);
-        } else {
-          this.execSync(["SET", this.key(sessionId), json]);
-        }
-      }
-      destroy(sessionId) {
-        this.execSync(["DEL", this.key(sessionId)]);
-      }
     };
     FLASH_PREFIX = "_flash_";
     Session = class {
@@ -12354,14 +12347,6 @@ function headStripIntercept(rawReq, rawRes) {
 function isCompressibleContentType(contentType) {
   return COMPRESSIBLE_PREFIXES.some((prefix) => contentType.includes(prefix));
 }
-function etagMatchesInm(ifNoneMatch, etag) {
-  const strip = (tag) => tag.trim().replace(/^W\//, "");
-  const target = strip(etag);
-  return ifNoneMatch.split(",").some((candidate) => {
-    const trimmed = candidate.trim();
-    return trimmed === "*" || strip(trimmed) === target;
-  });
-}
 function maybeCompressResponse(body, rawReq, rawRes) {
   const acceptEncoding = String(rawReq.headers["accept-encoding"] ?? "");
   const contentTypeHeader = rawRes.getHeader("content-type");
@@ -12377,7 +12362,7 @@ function maybeCompressResponse(body, rawReq, rawRes) {
 }
 function responseIsNotModified(rawReq, rawRes, etag) {
   const ifNoneMatch = String(rawReq.headers["if-none-match"] ?? "");
-  if (ifNoneMatch) return etagMatchesInm(ifNoneMatch, etag);
+  if (ifNoneMatch) return etagMatches(ifNoneMatch, etag);
   const lastModifiedHeader = rawRes.getHeader("last-modified");
   if (typeof lastModifiedHeader !== "string") return false;
   const ifModifiedSince = String(rawReq.headers["if-modified-since"] ?? "");
@@ -12505,6 +12490,7 @@ var init_dispatchPipeline = __esm({
   "../core/src/dispatchPipeline.ts"() {
     "use strict";
     init_logger();
+    init_etag();
     COMPRESSIBLE_PREFIXES = [
       "text/",
       "application/json",
@@ -12600,18 +12586,11 @@ function isNotModified(req2, etag, stat) {
   }
   return false;
 }
-function etagMatches(ifNoneMatch, etag) {
-  const strip = (tag) => tag.trim().replace(/^W\//, "");
-  const target = strip(etag);
-  return ifNoneMatch.split(",").some((candidate) => {
-    const trimmed = candidate.trim();
-    return trimmed === "*" || strip(trimmed) === target;
-  });
-}
 var COMPRESSIBLE_PREFIXES2, MIME_TYPES;
 var init_static = __esm({
   "../core/src/static.ts"() {
     "use strict";
+    init_etag();
     COMPRESSIBLE_PREFIXES2 = [
       "text/",
       "application/json",
@@ -13188,6 +13167,25 @@ Generated by DevMailbox.seed() for development purposes.`,
   }
 });
 
+// ../core/src/upstreamResponse.ts
+async function relayUpstreamResponse(res, upstream) {
+  const raw = await upstream.text();
+  const status2 = upstream.status || 200;
+  try {
+    res.json(JSON.parse(raw), status2);
+  } catch {
+    res.raw.writeHead(status2, {
+      "Content-Type": upstream.headers.get("content-type") ?? "text/plain; charset=utf-8"
+    });
+    res.raw.end(raw);
+  }
+}
+var init_upstreamResponse = __esm({
+  "../core/src/upstreamResponse.ts"() {
+    "use strict";
+  }
+});
+
 // ../core/src/metrics.ts
 import * as fs3 from "node:fs";
 import * as path2 from "node:path";
@@ -13403,6 +13401,7 @@ var init_feedback = __esm({
     "use strict";
     init_auth();
     init_devAdmin();
+    init_upstreamResponse();
     RATE_LIMIT_WINDOW_SEC = 3600;
     RATE_LIMIT_MAX = 5;
     _rateLimitHits = /* @__PURE__ */ new Map();
@@ -13449,16 +13448,7 @@ var init_feedback = __esm({
         return;
       }
       clearTimeout(timer);
-      const raw = await upstream.text();
-      const status2 = upstream.status || 200;
-      try {
-        res.json(JSON.parse(raw), status2);
-      } catch {
-        res.raw.writeHead(status2, {
-          "Content-Type": upstream.headers.get("content-type") ?? "text/plain; charset=utf-8"
-        });
-        res.raw.end(raw);
-      }
+      await relayUpstreamResponse(res, upstream);
     };
     __feedbackDirname = dirname5(fileURLToPath2(import.meta.url));
     WIDGET_BUNDLE_PATH = resolve5(__feedbackDirname, "__feedback", "widget.js");
@@ -13508,6 +13498,38 @@ var init_version = __esm({
   }
 });
 
+// ../cli/src/util.ts
+function parseFlags(args, booleanFlags) {
+  const flags = {};
+  const positional = [];
+  let i = 0;
+  while (i < args.length) {
+    const arg = args[i];
+    if (arg.startsWith("--")) {
+      const key = arg.slice(2);
+      if (booleanFlags?.has(key)) {
+        flags[key] = true;
+        i += 1;
+      } else if (i + 1 < args.length && !args[i + 1].startsWith("--")) {
+        flags[key] = args[i + 1];
+        i += 2;
+      } else {
+        flags[key] = true;
+        i += 1;
+      }
+    } else {
+      positional.push(arg);
+      i += 1;
+    }
+  }
+  return { flags, positional };
+}
+var init_util = __esm({
+  "../cli/src/util.ts"() {
+    "use strict";
+  }
+});
+
 // ../cli/src/commands/generate.ts
 var generate_exports = {};
 __export(generate_exports, {
@@ -13772,28 +13794,7 @@ function parseCliArgs(args) {
     "json",
     "dry-run"
   ]);
-  const flags = {};
-  const positional = [];
-  let i = 0;
-  while (i < args.length) {
-    if (args[i].startsWith("--")) {
-      const key = args[i].slice(2);
-      if (booleanFlags.has(key)) {
-        flags[key] = true;
-        i += 1;
-      } else if (i + 1 < args.length && !args[i + 1].startsWith("--")) {
-        flags[key] = args[i + 1];
-        i += 2;
-      } else {
-        flags[key] = true;
-        i += 1;
-      }
-    } else {
-      positional.push(args[i]);
-      i += 1;
-    }
-  }
-  return { flags, positional };
+  return parseFlags(args, booleanFlags);
 }
 function parseEvery(every) {
   if (!every || every === true) return 60;
@@ -15354,6 +15355,7 @@ var FIELD_TYPE_MAP, SQL_RESERVED_TABLE_NAMES, RESOLUTION_ENVELOPE_VERSION, __res
 var init_generate = __esm({
   "../cli/src/commands/generate.ts"() {
     "use strict";
+    init_util();
     FIELD_TYPE_MAP = {
       string: { orm: '"string"', sql: "VARCHAR(255)", defaultVal: "''" },
       str: { orm: '"string"', sql: "VARCHAR(255)", defaultVal: "''" },
@@ -18972,6 +18974,7 @@ __export(websocket_exports, {
   CLOSE_NORMAL: () => CLOSE_NORMAL,
   CLOSE_POLICY_VIOLATION: () => CLOSE_POLICY_VIOLATION,
   CLOSE_PROTOCOL_ERROR: () => CLOSE_PROTOCOL_ERROR,
+  MessageAssembler: () => MessageAssembler,
   OP_BINARY: () => OP_BINARY,
   OP_CLOSE: () => OP_CLOSE,
   OP_CONTINUATION: () => OP_CONTINUATION,
@@ -19229,21 +19232,24 @@ function serveWebSocketRoute(req2, socket, head) {
     state.closed = true;
     void Promise.resolve().then(() => conn._onClose ? conn._onClose() : handler(conn, "close", "")).catch((e) => Log.error(`WebSocket close handler error: ${e.message}`)).finally(() => wsRouteManager.remove(conn.id));
   };
+  const assembler = new MessageAssembler();
   socket.on("data", (chunk) => {
     buffer = Buffer.concat([buffer, chunk]);
     while (buffer.length > 0) {
       const frame = parseFrame(buffer);
       if (!frame) break;
       buffer = buffer.subarray(frame.bytesConsumed);
-      switch (frame.opcode) {
+      const whole = assembler.push(frame);
+      if (!whole) continue;
+      switch (whole.opcode) {
         case OP_TEXT: {
-          const text = frame.payload.toString("utf-8");
+          const text = whole.payload.toString("utf-8");
           void Promise.resolve().then(() => conn._onMessage ? conn._onMessage(text) : handler(conn, "message", text)).catch((e) => Log.error(`WebSocket message handler error: ${e.message}`));
           break;
         }
         case OP_PING:
           try {
-            socket.write(buildFrame(OP_PONG, frame.payload));
+            socket.write(buildFrame(OP_PONG, whole.payload));
           } catch {
           }
           break;
@@ -19262,7 +19268,7 @@ function serveWebSocketRoute(req2, socket, head) {
   socket.on("error", fireClose);
   return true;
 }
-var MAGIC_STRING, OP_CONTINUATION, OP_TEXT, OP_BINARY, OP_CLOSE, OP_PING, OP_PONG, CLOSE_NORMAL, CLOSE_GOING_AWAY, CLOSE_PROTOCOL_ERROR, CLOSE_POLICY_VIOLATION, WebSocketServer, WsRouteManager, wsRouteManager, DevReloadWsManager, devReloadWs;
+var MAGIC_STRING, OP_CONTINUATION, OP_TEXT, OP_BINARY, OP_CLOSE, OP_PING, OP_PONG, CLOSE_NORMAL, CLOSE_GOING_AWAY, CLOSE_PROTOCOL_ERROR, CLOSE_POLICY_VIOLATION, MessageAssembler, WebSocketServer, WsRouteManager, wsRouteManager, DevReloadWsManager, devReloadWs;
 var init_websocket = __esm({
   "../core/src/websocket.ts"() {
     "use strict";
@@ -19281,6 +19287,30 @@ var init_websocket = __esm({
     CLOSE_GOING_AWAY = 1001;
     CLOSE_PROTOCOL_ERROR = 1002;
     CLOSE_POLICY_VIOLATION = 1008;
+    MessageAssembler = class {
+      parts = [];
+      opcode = 0;
+      push(frame) {
+        if (frame.opcode >= 8) return { opcode: frame.opcode, payload: frame.payload };
+        if (frame.opcode === OP_CONTINUATION) {
+          if (!this.opcode) return null;
+          this.parts.push(frame.payload);
+          if (!frame.fin) return null;
+          const whole = { opcode: this.opcode, payload: Buffer.concat(this.parts) };
+          this.parts = [];
+          this.opcode = 0;
+          return whole;
+        }
+        if (frame.fin) {
+          this.parts = [];
+          this.opcode = 0;
+          return { opcode: frame.opcode, payload: frame.payload };
+        }
+        this.opcode = frame.opcode;
+        this.parts = [frame.payload];
+        return null;
+      }
+    };
     WebSocketServer = class {
       port;
       server = null;
@@ -19723,6 +19753,15 @@ var init_websocket = __esm({
           this.emit("error", err, client);
         });
       }
+      assemblers = /* @__PURE__ */ new WeakMap();
+      assemblerFor(client) {
+        let a = this.assemblers.get(client);
+        if (!a) {
+          a = new MessageAssembler();
+          this.assemblers.set(client, a);
+        }
+        return a;
+      }
       processBuffer(client, buffer, setBuffer) {
         let remaining = buffer;
         while (remaining.length > 0) {
@@ -19730,15 +19769,17 @@ var init_websocket = __esm({
           if (!frame) break;
           remaining = remaining.subarray(frame.bytesConsumed);
           client.lastActivity = Date.now();
-          switch (frame.opcode) {
+          const whole = this.assemblerFor(client).push(frame);
+          if (!whole) continue;
+          switch (whole.opcode) {
             case OP_TEXT:
-              this.emit("message", client, frame.payload.toString("utf-8"));
+              this.emit("message", client, whole.payload.toString("utf-8"));
               break;
             case OP_BINARY:
-              this.emit("message", client, frame.payload);
+              this.emit("message", client, whole.payload);
               break;
             case OP_PING: {
-              const pongFrame = buildFrame(OP_PONG, frame.payload);
+              const pongFrame = buildFrame(OP_PONG, whole.payload);
               try {
                 client.socket.write(pongFrame);
               } catch {
@@ -24116,16 +24157,7 @@ async function proxyToSupervisor(req2, res, downstreamPath) {
     return;
   }
   clearTimeout(timer);
-  const raw = await upstream.text();
-  const status2 = upstream.status || 200;
-  try {
-    res.json(JSON.parse(raw), status2);
-  } catch {
-    res.raw.writeHead(status2, {
-      "Content-Type": upstream.headers.get("content-type") ?? "text/plain; charset=utf-8"
-    });
-    res.raw.end(raw);
-  }
+  await relayUpstreamResponse(res, upstream);
 }
 function resolveDevEnvVar(key) {
   const live = process.env[key];
@@ -24567,6 +24599,7 @@ var init_devAdmin = __esm({
   "../core/src/devAdmin.ts"() {
     "use strict";
     init_devMailbox();
+    init_upstreamResponse();
     init_dotenv();
     init_metrics();
     init_feedback();
@@ -47718,6 +47751,36 @@ var init_shapes = __esm({
   }
 });
 
+// src/graph/adapters/rowMapping.ts
+function errorMessage(exc) {
+  if (exc instanceof Error) return exc.message;
+  return String(exc);
+}
+function nodeFromRow(row) {
+  if (row === null || row === void 0) return null;
+  return new GraphNode(
+    String(row.id),
+    row.labels ?? [],
+    row.props ?? {}
+  );
+}
+function edgeFromRow(row) {
+  if (row === null || row === void 0) return null;
+  return new GraphEdge(
+    String(row.id),
+    String(row.type),
+    String(row.f),
+    String(row.t),
+    row.props ?? {}
+  );
+}
+var init_rowMapping = __esm({
+  "src/graph/adapters/rowMapping.ts"() {
+    "use strict";
+    init_shapes();
+  }
+});
+
 // src/graph/connectTimeout.ts
 function resolveGraphConnectTimeout() {
   const raw = (process.env[GRAPH_CONNECT_TIMEOUT_VARIABLE] ?? "").trim();
@@ -47757,15 +47820,12 @@ function propClause(properties) {
   for (const key of keys) params[`p_${key}`] = props[key];
   return { clause: `{${pairs}}`, params };
 }
-function errorMessage(exc) {
-  if (exc instanceof Error) return exc.message;
-  return String(exc);
-}
 var DRIVER_PACKAGE2, driver, UltipaClient, UltipaConnectError, UNBOUNDED_CONNECT_SECONDS, UltipaGraphAdapter;
 var init_ultipa = __esm({
   async "src/graph/adapters/ultipa.ts"() {
     "use strict";
     init_shapes();
+    init_rowMapping();
     init_errors();
     init_connectTimeout2();
     DRIVER_PACKAGE2 = "tina4-ultipa";
@@ -47823,12 +47883,7 @@ var init_ultipa = __esm({
       }
       // -- portable node/edge/traverse core (GQL) ----------------------------
       nodeFromRow(row) {
-        if (row === null || row === void 0) return null;
-        return new GraphNode(
-          String(row.id),
-          row.labels ?? [],
-          row.props ?? {}
-        );
+        return nodeFromRow(row);
       }
       async addNode(label, properties = null) {
         const { clause, params } = propClause(properties);
@@ -47842,15 +47897,7 @@ var init_ultipa = __esm({
         params.to_id = toId;
         const gql = `MATCH (a), (b) WHERE id(a) = $from_id AND id(b) = $to_id INSERT (a)-[e:\`${type2}\` ${clause}]->(b) RETURN id(e) AS id, type(e) AS type, id(a) AS f, id(b) AS t, properties(e) AS props`;
         const rows = (await this.run(gql, params, false)).dicts();
-        if (rows.length === 0) return null;
-        const row = rows[0];
-        return new GraphEdge(
-          String(row.id),
-          String(row.type),
-          String(row.f),
-          String(row.t),
-          row.props ?? {}
-        );
+        return edgeFromRow(rows[0]);
       }
       async getNode(nodeId) {
         const gql = `MATCH (n) WHERE id(n) = $id RETURN id(n) AS id, labels(n) AS labels, properties(n) AS props`;
@@ -47915,10 +47962,6 @@ var bolt_exports = {};
 __export(bolt_exports, {
   BoltGraphAdapter: () => BoltGraphAdapter
 });
-function errorMessage2(exc) {
-  if (exc instanceof Error) return exc.message;
-  return String(exc);
-}
 function boltId(id) {
   const value = Number(id);
   return Number.isNaN(value) ? -1 : value;
@@ -47928,6 +47971,7 @@ var init_bolt = __esm({
   async "src/graph/adapters/bolt.ts"() {
     "use strict";
     init_shapes();
+    init_rowMapping();
     init_errors();
     init_connectTimeout2();
     DRIVER_PACKAGE3 = "neo4j-driver";
@@ -47963,7 +48007,7 @@ var init_bolt = __esm({
           const result = await session.run(cypher, params ?? {});
           return result.records.map((record) => record.toObject());
         } catch (exc) {
-          this.lastError = errorMessage2(exc);
+          this.lastError = errorMessage(exc);
           const code = exc?.code ?? "";
           const message = this.lastError.toLowerCase();
           if (code === "ServiceUnavailable" || code === neo4j.error?.SERVICE_UNAVAILABLE || message.includes("timed out") || message.includes("timeout")) {
@@ -47987,12 +48031,7 @@ var init_bolt = __esm({
       }
       // -- portable node/edge/traverse core (Cypher) -------------------------
       nodeFromRow(row) {
-        if (row === null || row === void 0) return null;
-        return new GraphNode(
-          String(row.id),
-          row.labels ?? [],
-          row.props ?? {}
-        );
+        return nodeFromRow(row);
       }
       async addNode(label, properties = null) {
         const cypher = `CREATE (n:\`${label}\` $props) RETURN id(n) AS id, labels(n) AS labels, properties(n) AS props`;
@@ -48006,15 +48045,7 @@ var init_bolt = __esm({
           to_id: boltId(toId),
           props: properties ?? {}
         });
-        if (rows.length === 0) return null;
-        const row = rows[0];
-        return new GraphEdge(
-          String(row.id),
-          String(row.type),
-          String(row.f),
-          String(row.t),
-          row.props ?? {}
-        );
+        return edgeFromRow(rows[0]);
       }
       async getNode(nodeId) {
         const cypher = `MATCH (n) WHERE id(n) = $id RETURN id(n) AS id, labels(n) AS labels, properties(n) AS props`;
@@ -48080,7 +48111,7 @@ function cleanProps(doc) {
   }
   return props;
 }
-function errorMessage3(exc) {
+function errorMessage2(exc) {
   if (exc instanceof Error) return exc.message;
   return String(exc);
 }
@@ -48119,14 +48150,14 @@ var init_arango = __esm({
         this.db = new ArangoDatabase(config);
       }
       connectOrError(exc) {
-        const text = errorMessage3(exc).toLowerCase();
+        const text = errorMessage2(exc).toLowerCase();
         if (text.includes("timed out") || text.includes("timeout") || text.includes("connection") || text.includes("econnrefused") || text.includes("etimedout") || text.includes("max retries")) {
           return new GraphConnectTimeout(
             `Graph connect to ${this.url.host}:${this.url.port} timed out (${GRAPH_CONNECT_TIMEOUT_VARIABLE}). Raise ${GRAPH_CONNECT_TIMEOUT_VARIABLE} if the server is simply slow, or set it to 0 to wait indefinitely.`,
             exc
           );
         }
-        return new GraphError(errorMessage3(exc), exc);
+        return new GraphError(errorMessage2(exc), exc);
       }
       async ensureCollections() {
         if (this.ensured) return;
@@ -48137,7 +48168,7 @@ var init_arango = __esm({
           if (!await edges.exists()) await this.db.createEdgeCollection(EDGE_COLLECTION);
           this.ensured = true;
         } catch (exc) {
-          this.lastError = errorMessage3(exc);
+          this.lastError = errorMessage2(exc);
           throw this.connectOrError(exc);
         }
       }
@@ -48147,7 +48178,7 @@ var init_arango = __esm({
           const cursor = await this.db.query({ query, bindVars: bind2 ?? {} });
           return await cursor.all();
         } catch (exc) {
-          this.lastError = errorMessage3(exc);
+          this.lastError = errorMessage2(exc);
           throw this.connectOrError(exc);
         }
       }