okmodel 0.6.0 → 0.7.0

package/dist/shared/{2z7wv5tj.js → 67txcrcw.js}

@@ -41,6 +41,7 @@ var FIND_OPTIONS = [
   "include",
   "limit",
   "orderBy",
+  "search",
   "select",
   "route",
   "signal",
@@ -56,12 +57,15 @@ var ONE_OPTIONS = [
   "timeout",
   "where"
 ];
+var COUNT_OPTIONS = ["route", "search", "signal", "timeout", "where"];
 var FILTER_OPTIONS = ["route", "signal", "timeout", "where"];
 function readOptionNames(op) {
   if (op === "find")
     return FIND_OPTIONS;
   if (op === "one")
     return ONE_OPTIONS;
+  if (op === "count")
+    return COUNT_OPTIONS;
   return FILTER_OPTIONS;
 }
 var BASE_RULES = [
@@ -78,7 +82,19 @@ function readNeedsOperatorSql(schema, call) {
   if (operatorEmit !== undefined)
     return false;
   const table = indexes(schema).get(call.table);
-  return table !== undefined && needsOperatorSql(table, call.where);
+  if (table === undefined)
+    return false;
+  return needsOperatorSql(table, call.where) || orderHasRelevance(call.orderBy);
+}
+function orderHasRelevance(orderBy) {
+  if (!isRecord(orderBy))
+    return false;
+  for (const key of Object.keys(orderBy)) {
+    const value = orderBy[key];
+    if (isOperator(value) && operatorName(value) === "relevance")
+      return true;
+  }
+  return false;
 }
 function emitRelationFrom(schema, relation, child, sink, parent, alias, depth) {
   if (relation.through !== undefined) {
@@ -122,12 +138,12 @@ function needsOperatorSql(table, value, key) {
 function isTextColumn(dataType) {
   return dataType === "text" || dataType === "citext" || dataType.startsWith("varchar(") || dataType.startsWith("char(") || dataType.startsWith("character");
 }
-function emitLazy(column, ref, name, value, sink) {
+function emitLazy(column, ref, name, value, sink, order) {
   const emit = operatorEmit;
   if (emit === undefined) {
-    fail("OKM1121", `Operator ${name} on ${column.field} is not loaded.`);
+    fail2("OKM1121", `Operator ${name} on ${column.field} is not loaded.`);
   }
-  emit(column, ref, name, value, sink);
+  emit(column, ref, name, value, sink, order);
 }
 function verifyRead(schema, call) {
   if (!safetyInstalled())
@@ -208,7 +224,7 @@ function logicalIntent(call) {
     table: call.table,
     where: plain(call.where),
     select: call.select,
-    orderBy: call.orderBy,
+    orderBy: plain(call.orderBy),
     limit: call.limit,
     include: plain(call.include),
     all: call.all
@@ -261,7 +277,7 @@ function emitRead(schema, call, sink, outputs, hooks) {
     throwNamed2("OKM1120", call.table, [...indexes(schema).keys()], `Table ${call.table} is not in the schema. Accepted names: ${list([...indexes(schema).keys()])}.`);
   }
   if (call.build !== undefined) {
-    call.build(schema, table, sink, outputs, call);
+    call.build(schema, table, sink, outputs, call, hooks);
     return;
   }
   rejectOptions(call);
@@ -296,7 +312,7 @@ function emitRead(schema, call, sink, outputs, hooks) {
     column += 1;
   }
   if (call.include !== undefined && hooks === undefined) {
-    fail("OKM1120", "An include needs the include planner.");
+    fail2("OKM1120", "An include needs the include planner.");
   }
   const includes = hooks === undefined || call.include === undefined ? [] : hooks.read(schema, table, call.include, call.all);
   if (selected.length === 0 && includes.length === 0)
@@ -375,7 +391,7 @@ function emitWhere(schema, table, where, sink, alias, depth, appended = false, e
       continue;
     const joined = isOperator(part);
     if (!joined && !isRecord(part))
-      fail("OKM1121", WHERE_FIELDS);
+      fail2("OKM1121", WHERE_FIELDS);
     if (!joined && Object.keys(part).length === 0)
       continue;
     sink.text(started ? " and " : " where ");
@@ -389,7 +405,7 @@ function emitWhere(schema, table, where, sink, alias, depth, appended = false, e
 var WHERE_FIELDS = "where must be an object of fields. Wrap an object value with eq.";
 function emitAnd(schema, table, where, sink, alias, depth) {
   if (!isRecord(where)) {
-    fail("OKM1121", WHERE_FIELDS);
+    fail2("OKM1121", WHERE_FIELDS);
   }
   const keys = Object.keys(where);
   let wrote = false;
@@ -446,7 +462,7 @@ function emitOperator(schema, table, column, ref, name, value, sink, alias, dept
     return;
   }
   if (column === undefined) {
-    fail("OKM1121", "That operator needs a field.");
+    fail2("OKM1121", "That operator needs a field.");
   }
   if (name === "not") {
     emitNot(schema, table, column, ref, value, sink, alias, depth);
@@ -464,7 +480,7 @@ function emitOperator(schema, table, column, ref, name, value, sink, alias, dept
   }
   if (name === "between") {
     if (!Array.isArray(value) || value.length !== 2) {
-      fail("OKM1121", `between on ${column.field} needs two values.`);
+      fail2("OKM1121", `between on ${column.field} needs two values.`);
     }
     sink.text(ref);
     sink.text(" between ");
@@ -479,7 +495,7 @@ function emitOperator(schema, table, column, ref, name, value, sink, alias, dept
   }
   if (TEXT_OPERATORS.includes(`,${name},`) && isTextColumn(column.dataType)) {
     if (typeof value !== "string") {
-      fail("OKM1121", `${name} on ${column.field} needs a string.`);
+      fail2("OKM1121", `${name} on ${column.field} needs a string.`);
     }
     sink.text(ref);
     if (name === "like" || name === "ilike") {
@@ -489,7 +505,7 @@ function emitOperator(schema, table, column, ref, name, value, sink, alias, dept
     }
     sink.text(" like ");
     if (name !== "startsWith" && name !== "endsWith" && name !== "contains") {
-      fail("OKM1121", `${name} on ${column.field} needs a string.`);
+      fail2("OKM1121", `${name} on ${column.field} needs a string.`);
     }
     sink.param(literalPattern(value, name));
     sink.text(" escape E'\\\\'");
@@ -517,7 +533,7 @@ function emitNot(schema, table, column, ref, value, sink, alias, depth) {
 }
 function emitIn(column, ref, name, value, sink) {
   if (!Array.isArray(value)) {
-    fail("OKM1121", `${name} on ${column.field} needs a list.`);
+    fail2("OKM1121", `${name} on ${column.field} needs a list.`);
   }
   sink.mark(`:${String(value.length)}`);
   if (value.length === 0) {
@@ -549,7 +565,7 @@ function emitOr(schema, table, value, sink, alias, depth) {
       sink.text(" or ");
     sink.text("(");
     if (!isRecord(branch)) {
-      fail("OKM1121", "or() branches must be where objects.");
+      fail2("OKM1121", "or() branches must be where objects.");
     }
     let wrote = false;
     for (const key of Object.keys(branch)) {
@@ -569,15 +585,15 @@ function emitOr(schema, table, value, sink, alias, depth) {
 }
 function emitRelationFilter(schema, relation, value, sink, alias, depth) {
   if (!isOperator(value)) {
-    fail("OKM1121", `Relation ${relation.name} needs has, none, or every.`);
+    fail2("OKM1121", `Relation ${relation.name} needs has, none, or every.`);
   }
   const name = operatorName(value);
   if (name !== "has" && name !== "none" && name !== "every") {
-    fail("OKM1121", `Relation ${relation.name} needs has, none, or every.`);
+    fail2("OKM1121", `Relation ${relation.name} needs has, none, or every.`);
   }
   const child = indexes(schema).get(relation.table);
   if (child === undefined) {
-    fail("OKM1120", `Relation ${relation.name} names ${relation.table}, which is not in the schema.`);
+    fail2("OKM1120", `Relation ${relation.name} names ${relation.table}, which is not in the schema.`);
   }
   const childAlias = `r${String(depth)}_${relation.name}`;
   sink.mark(`rel:${relation.name}:${name}`);
@@ -601,7 +617,7 @@ function emitOrder(table, orderBy, sink, alias) {
   if (orderBy === undefined)
     return;
   if (!isRecord(orderBy)) {
-    fail("OKM1120", "orderBy must be an object of fields.");
+    fail2("OKM1120", "orderBy must be an object of fields.");
   }
   const keys = Object.keys(orderBy);
   if (keys.length === 0)
@@ -616,9 +632,14 @@ function emitOrder(table, orderBy, sink, alias) {
       throwNamed2("OKM1120", key, table.names, `Field ${key} is not on ${table.model.name}. Accepted names: ${list(table.names)}.`);
     }
     refuseHidden(column);
-    const parsed = parseOrder(key, orderBy[key]);
+    const value = orderBy[key];
     if (index > 0)
       sink.text(", ");
+    if (isOperator(value) && operatorName(value) === "relevance") {
+      emitLazy(column, `${alias}.${quote(column.sql)}`, "relevance", operatorValue(value), sink, true);
+      continue;
+    }
+    const parsed = parseOrder(key, value);
     sink.text(alias);
     sink.text(".");
     sink.text(quote(column.sql));
@@ -647,7 +668,7 @@ function emitPrimaryOrder(table, sink, alias) {
 function refuseHidden(column) {
   if (column.hidden !== true)
     return;
-  fail("OKM1120", `Field ${column.field} is hidden.`, "Call hidden({ filterable: true }).");
+  fail2("OKM1120", `Field ${column.field} is hidden.`, "Call hidden({ filterable: true }).");
 }
 function emitLimit(call, sink) {
   if (call.op === "one") {
@@ -660,7 +681,7 @@ function emitLimit(call, sink) {
     return;
   if (call.all !== undefined) {
     if (call.all.length === 0) {
-      fail("OKM1101", "find() .all needs a reason.");
+      fail2("OKM1101", "find() .all needs a reason.");
     }
     sink.mark(`all:${call.all}`);
     if (call.limit !== undefined) {
@@ -672,7 +693,7 @@ function emitLimit(call, sink) {
     return;
   }
   if (call.limit === undefined) {
-    fail("OKM1101", "find() needs a limit, or .all(reason) when the full set is intentional.");
+    fail2("OKM1101", "find() needs a limit, or .all(reason) when the full set is intentional.");
   }
   const limit = readLimit(call.limit);
   sink.text(" limit ");
@@ -689,12 +710,12 @@ function selectedColumns(table, select) {
     return columns;
   }
   if (!Array.isArray(select)) {
-    fail("OKM1120", "select must be a list of field names.");
+    fail2("OKM1120", "select must be a list of field names.");
   }
   const columns = [];
   for (const name of select) {
     if (typeof name !== "string") {
-      fail("OKM1120", "select must be a list of field names.");
+      fail2("OKM1120", "select must be a list of field names.");
     }
     const column = table.columns.get(name);
     if (column === undefined) {
@@ -712,17 +733,17 @@ function parseOrder(field, value) {
   if (isRecord(value)) {
     const dir = value.dir ?? value.direction;
     if (dir !== "asc" && dir !== "desc") {
-      fail("OKM1120", `orderBy ${field} must be asc or desc.`);
+      fail2("OKM1120", `orderBy ${field} must be asc or desc.`);
     }
     const nulls = value.nulls;
     if (nulls === undefined)
       return { dir, nulls: dir === "asc" ? "last" : "first" };
     if (nulls !== "first" && nulls !== "last") {
-      fail("OKM1120", `orderBy ${field} nulls must be first or last.`);
+      fail2("OKM1120", `orderBy ${field} nulls must be first or last.`);
     }
     return { dir, nulls };
   }
-  fail("OKM1120", `orderBy ${field} must be asc or desc.`);
+  fail2("OKM1120", `orderBy ${field} must be asc or desc.`);
 }
 function rejectOptions(call) {
   const accepted = readOptionNames(call.op);
@@ -739,11 +760,11 @@ function rejectOptions(call) {
     present.include = call.include;
   rejectKeys(present, accepted, call.op);
 }
-function rejectKeys(value, accepted, where) {
+function rejectKeys(value, accepted, where, search) {
   for (const key of Object.keys(value)) {
     if (accepted.includes(key))
       continue;
-    throwNamed2("OKM1120", key, accepted, `Option ${key} is not accepted by ${where}. Accepted options: ${list(accepted)}.`);
+    throwNamed2("OKM1120", key, accepted, key === "search" && search === true ? `${where}() does not take search. Pass search to find or count.` : `Option ${key} is not accepted by ${where}. Accepted options: ${list(accepted)}.`);
   }
 }
 function readLimit(value) {
@@ -754,7 +775,7 @@ function readLimit(value) {
 }
 function requireValue(column, value) {
   if (value === undefined || value === null) {
-    fail("OKM1121", `Field ${column.field} needs a value.`);
+    fail2("OKM1121", `Field ${column.field} needs a value.`);
   }
   if (typeof value === "object")
     takeObject(column, value);
@@ -762,7 +783,7 @@ function requireValue(column, value) {
 }
 function takeObject(column, value, bare = false) {
   if (bare || !column.accepts?.includes({}.toString.call(value).slice(8, -1))) {
-    fail("OKM1121", `Field ${column.field} rejects that object.`);
+    fail2("OKM1121", `Field ${column.field} rejects that object.`);
   }
 }
 function projectExpr(sql, dataType) {
@@ -867,7 +888,7 @@ var FAIL_FIX = {
 function registerFailFix(code, summary) {
   FAIL_FIX[code] = summary;
 }
-function fail(code, message, fix) {
+function fail2(code, message, fix) {
   const summary = fix ?? FAIL_FIX[code];
   throw new OkmError2(code, message, summary === undefined ? undefined : { fix: { summary } });
 }
@@ -891,4 +912,4 @@ function hasMany(include) {
   return Object.keys(include).length > 0;
 }
 
-export { withRowFilters, installArchiveInspect, archiveRules, readOptionNames, installOperatorSql, readNeedsOperatorSql, emitRelationFrom, bindCall, compileCall, decodeResult, logicalIntent, appliedRules, emitJoin, emitWhere, emitOrder, emitPrimaryOrder, refuseHidden, selectedColumns, parseOrder, rejectKeys, readLimit, takeObject, projectExpr, jsonExpr, decodeRow, cell, indexes, quote, list, isRecord, orFail, registerFailFix, fail };
+export { withRowFilters, installArchiveInspect, archiveRules, readOptionNames, installOperatorSql, readNeedsOperatorSql, orderHasRelevance, emitRelationFrom, needsOperatorSql, bindCall, compileCall, decodeResult, logicalIntent, appliedRules, emitJoin, emitWhere, emitOrder, emitPrimaryOrder, refuseHidden, emitLimit, selectedColumns, parseOrder, rejectKeys, readLimit, takeObject, projectExpr, jsonExpr, decodeRow, cell, indexes, quote, list, isRecord, orFail, registerFailFix, fail2 };

package/dist/shared/79dt02vc.js

@@ -0,0 +1,12 @@
+import {
+  rejectUncancellable
+} from "./kb2sdhfb.js";
+
+// src/adapters/pg/no-inflight-timeout.ts
+function noTimeout(options) {
+  if ((options?.timeout ?? 0) <= 0)
+    return;
+  return rejectUncancellable();
+}
+
+export { noTimeout };

package/dist/shared/{8x72s86k.js → 7k9grvf6.js}

@@ -4,10 +4,10 @@ import {
 import {
   viewGlobalReason,
   viewMentions
-} from "./x3jc53kg.js";
+} from "./5e3tf63j.js";
 import {
   createClient
-} from "./j60w0dvr.js";
+} from "./tbrvgw6z.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -641,7 +641,10 @@ async function readTenant(facts, handle, where) {
           leak(facts.name, "stream", item);
       }
     } catch (error) {
-      if (!(error instanceof OkmError2) || error.code !== "OKM1111")
+      if (!(error instanceof OkmError2))
+        throw error;
+      const refused = error.code === "OKM1111" || error.code === "OKM1120" && error.message.includes("primary key");
+      if (!refused)
         throw error;
     }
   }
@@ -988,7 +991,10 @@ async function readFiltered(name, handle, where) {
           leak(name, "stream", item);
       }
     } catch (error) {
-      if (!(error instanceof OkmError2) || error.code !== "OKM1111")
+      if (!(error instanceof OkmError2))
+        throw error;
+      const refused = error.code === "OKM1111" || error.code === "OKM1120" && error.message.includes("primary key");
+      if (!refused)
         throw error;
     }
   }

package/dist/shared/7kms6fvj.js

@@ -0,0 +1,20 @@
+// src/adapters/pg/cursor.ts
+async function* cursorStream(run, text, params) {
+  const name = "okm_stream";
+  await run("BEGIN");
+  try {
+    await run(`DECLARE ${name} NO SCROLL CURSOR FOR ${text}`, params);
+    for (;; ) {
+      const chunk = await run(`FETCH 64 FROM ${name}`);
+      if (chunk.rows.length === 0)
+        break;
+      yield chunk.rows;
+    }
+  } finally {
+    await run("ROLLBACK").catch(() => {
+      return;
+    });
+  }
+}
+
+export { cursorStream };

package/dist/shared/7mnme5tn.js

@@ -0,0 +1,8 @@
+import {
+  build2,
+  identityColumn2
+} from "./xjk7hnn5.js";
+export {
+  build2 as build,
+  identityColumn2 as identityColumn
+};

package/dist/shared/7n7ddwt4.js

@@ -0,0 +1,6 @@
+import {
+  stack2
+} from "./mss6ctgv.js";
+export {
+  stack2 as stack
+};

package/dist/shared/{5j36z8dn.js → 81ebdx9p.js}

@@ -1,28 +1,26 @@
 import {
-  noTimeout2
-} from "./8dqhth8c.js";
+  noTimeout
+} from "./79dt02vc.js";
 import {
   PGLITE_CAPABILITIES,
   driverErrors,
   rejectClosed,
   rejectCancelled,
   rejectTimedOut,
-  mapFailure,
   nextTransactionDepth,
   runCall,
   EMPTY_NOTICES,
   resultFrom
-} from "./cgbamx3e.js";
+} from "./kb2sdhfb.js";
 
 // src/adapters/pg/pglite.ts
 import { PGlite } from "@electric-sql/pglite";
-var RESET_ALL = "RESET ALL";
-var UNLOCK = "SELECT pg_advisory_unlock_all()";
 async function open3(config = {}) {
+  const wire = await import("./g6evj1j3.js");
   const db = new PGlite({
     dataDir: config.dataDir ?? "memory://",
-    parsers: WIRE,
-    serializers: WIRE
+    parsers: wire.parsers,
+    serializers: wire.serializers
   });
   await db.waitReady;
   const acquireMs = config.timeouts?.acquire;
@@ -30,8 +28,8 @@ async function open3(config = {}) {
   const notices = noticeBuffer();
   const queryOptions = {
     rowMode: "array",
-    parsers: WIRE,
-    serializers: WIRE,
+    parsers: wire.parsers,
+    serializers: wire.serializers,
     onNotice(notice) {
       notices.push(notice);
     }
@@ -42,7 +40,7 @@ async function open3(config = {}) {
     inflight += 1;
   }, () => {
     inflight = Math.max(0, inflight - 1);
-  });
+  }, (error) => wire.fail(error));
   async function lease() {
     if (closed)
       return rejectClosed();
@@ -50,13 +48,17 @@ async function open3(config = {}) {
     let released = false;
     return {
       execute: (text, params, options) => {
-        noTimeout2(options);
+        const refused = noTimeout(options);
+        if (refused !== undefined)
+          return refused;
         return runCall(closed, options, (watch) => session.query(text, params, watch));
       },
       batch: (statements, options) => {
-        noTimeout2(options);
+        const refused = noTimeout(options);
+        if (refused !== undefined)
+          return refused;
         return runCall(closed, options, async (watch) => {
-          const { runAtomicBatch } = await import("./ag4c7516.js");
+          const { runAtomicBatch } = await import("./b76b8d95.js");
           return runAtomicBatch(session, statements, watch);
         });
       },
@@ -65,7 +67,8 @@ async function open3(config = {}) {
           return;
         released = true;
         try {
-          await reset(session);
+          const { resetQueried } = await import("./5fe3kbsh.js");
+          await resetQueried(session);
         } finally {
           slot.release();
         }
@@ -75,7 +78,9 @@ async function open3(config = {}) {
   return {
     capabilities: PGLITE_CAPABILITIES,
     execute(text, params, options) {
-      noTimeout2(options);
+      const refused = noTimeout(options);
+      if (refused !== undefined)
+        return refused;
       return runCall(closed, options, async (watch) => {
         await slot.acquire(acquireMs);
         try {
@@ -86,7 +91,9 @@ async function open3(config = {}) {
       });
     },
     async batch(statements, options) {
-      noTimeout2(options);
+      const refused = noTimeout(options);
+      if (refused !== undefined)
+        return refused;
       const connection = await lease();
       try {
         return await connection.batch(statements, options);
@@ -122,6 +129,12 @@ async function open3(config = {}) {
     }
   };
 }
+function seal2(pool) {
+  let closed = 0;
+  return new Proxy(pool, {
+    get: (inner, key) => key === "close" ? () => Promise.resolve(closed = 1) : (inner = inner[key], closed && inner?.call ? () => rejectClosed() : inner)
+  });
+}
 
 class PgliteSession {
   canCancel = false;
@@ -131,12 +144,14 @@ class PgliteSession {
   notices;
   enter;
   leave;
-  constructor(db, options, notices, enter, leave) {
+  fail;
+  constructor(db, options, notices, enter, leave, fail) {
     this.db = db;
     this.options = options;
     this.notices = notices;
     this.enter = enter;
     this.leave = leave;
+    this.fail = fail;
   }
   query(text, params, watch) {
     const why = watch?.reason();
@@ -153,7 +168,7 @@ class PgliteSession {
     }, (error) => {
       this.leave();
       this.notices.take();
-      return mapFailure(error).then((mapped) => {
+      return this.fail(stampQuery(error, text)).then((mapped) => {
         throw mapped;
       });
     });
@@ -237,56 +252,10 @@ class Slot {
     return this.waiters.length;
   }
 }
-async function reset(session) {
-  if (session.inTransaction())
-    await session.rollback().catch(() => {
-      return;
-    });
-  try {
-    await session.query(RESET_ALL, undefined, undefined);
-    await session.query(UNLOCK, undefined, undefined);
-  } catch {
-    await session.rollback().catch(() => {
-      return;
-    });
-    await session.query(RESET_ALL, undefined, undefined);
-    await session.query(UNLOCK, undefined, undefined);
-  }
-}
-function wireMap(oids) {
-  const parsers = {};
-  for (const oid of oids)
-    parsers[oid] = (value) => value;
-  return parsers;
+function stampQuery(error, text) {
+  if (typeof error === "object" && error !== null && !("query" in error))
+    Reflect.set(error, "query", text);
+  return error;
 }
-var WIRE = wireMap([
-  16,
-  17,
-  20,
-  21,
-  23,
-  25,
-  114,
-  700,
-  701,
-  1043,
-  1082,
-  1114,
-  1184,
-  1700,
-  2950,
-  3802,
-  1000,
-  1005,
-  1007,
-  1009,
-  1016,
-  1115,
-  1182,
-  1185,
-  1231,
-  199,
-  3807
-]);
 
-export { open3 };
+export { open3, seal2 };

package/dist/shared/{knmes2kh.js → 8skf0cam.js}

@@ -1,6 +1,6 @@
 import {
   FUNCTION_ARG_TYPES
-} from "./vjpnzwjz.js";
+} from "./b5pftnn2.js";
 import {
   OkmError2
 } from "./52szzakm.js";

package/dist/shared/9a4ae4p8.js

@@ -0,0 +1,31 @@
+// src/dialects/pg/ops/window.ts
+var RUNTIME = Symbol.for("okmodel.window");
+function isWindow(value) {
+  return typeof value === "object" && value !== null && RUNTIME in value;
+}
+function rowNumber2(options) {
+  return frame("rowNumber", "row_number", undefined, options);
+}
+function rank2(options) {
+  return frame("rank", "rank", undefined, options);
+}
+function denseRank2(options) {
+  return frame("denseRank", "dense_rank", undefined, options);
+}
+function runningTotal2(column, options) {
+  return frame("runningTotal", "sum", column, options);
+}
+function frame(label, fn, column, options) {
+  const spec = options ?? { orderBy: undefined, as: undefined, partitionBy: undefined };
+  return {
+    [RUNTIME]: true,
+    label,
+    fn,
+    column,
+    partitionBy: spec.partitionBy,
+    orderBy: spec.orderBy,
+    as: spec.as
+  };
+}
+
+export { isWindow, rowNumber2, rank2, denseRank2, runningTotal2 };