@blamejs/core 0.15.12 → 0.15.14

package/lib/sql.js

@@ -439,7 +439,7 @@ class SqlFunction {
       throw _err("b.sql.fn(name): name must be a string", "sql-builder/bad-fn");
     }
     var key = name.toUpperCase();
-    if (SQL_FUNCTIONS[key] === undefined) {
+    if (!Object.prototype.hasOwnProperty.call(SQL_FUNCTIONS, key)) {
       throw _err("b.sql.fn(name): '" + name + "' is not an allowlisted SQL function " +
         "(NOW / CURRENT_TIMESTAMP / CURRENT_DATE / CURRENT_TIME); a bound value uses a ? " +
         "placeholder, an arbitrary expression uses a guarded raw fragment", "sql-builder/bad-fn");
@@ -513,7 +513,7 @@ function _castType(type, dialect) {
     throw _err("cast type must be a non-empty string", "sql-builder/bad-cast");
   }
   var key = type.toLowerCase();
-  if (CAST_TYPES[key] === undefined) {
+  if (!Object.prototype.hasOwnProperty.call(CAST_TYPES, key)) {
     throw _err("cast type '" + type + "' is not on the allowlist (jsonb / json / " +
       "interval / uuid / text / int / bigint / timestamptz / boolean)", "sql-builder/bad-cast");
   }
@@ -1107,39 +1107,11 @@ function _checkRawFragment(sql, params, opts, where) {
 // comments are skipped. Single linear pass, no backtracking regex. Same
 // shape as db-query.js's scanner.
 function _assertRawNoStringLiteral(sql, where) {
-  var i = 0;
-  var len = sql.length;
-  while (i < len) {
-    var ch = sql.charAt(i);
-    var next = i + 1 < len ? sql.charAt(i + 1) : "";
-    if (ch === '"') {
-      i += 1;
-      while (i < len) {
-        if (sql.charAt(i) === '"') {
-          if (sql.charAt(i + 1) === '"') { i += 2; continue; }
-          i += 1; break;
-        }
-        i += 1;
-      }
-      continue;
-    }
-    if (ch === "-" && next === "-") {
-      while (i < len && sql.charAt(i) !== "\n") i += 1;
-      continue;
-    }
-    if (ch === "/" && next === "*") {
-      i += 2;
-      while (i < len && !(sql.charAt(i) === "*" && sql.charAt(i + 1) === "/")) i += 1;
-      i += 2;
-      continue;
-    }
-    if (ch === "'") {
-      throw _err(where + ": raw SQL must not contain a string literal ('...') - bind " +
-        "every value with a ? placeholder, or pass { allowLiterals: true } when the " +
-        "literal is static and operator-controlled", "sql-builder/raw-literal");
-    }
-    i += 1;
-  }
+  safeSql.assertNoRawStringLiteral(sql, where, function (w) {
+    return _err(w + ": raw SQL must not contain a string literal ('...') - bind " +
+      "every value with a ? placeholder, or pass { allowLiterals: true } when the " +
+      "literal is static and operator-controlled", "sql-builder/raw-literal");
+  });
 }
 
 // Refuse the two-char Postgres JSONB key-existence tokens (?| / ?&) in a raw
@@ -1188,51 +1160,10 @@ function _assertNoRawJsonbKeyOp(sql, where) {
 var _countPlaceholders = safeSql.countPlaceholders;
 
 // Translate the builder's `?` placeholders to a dialect's positional form
-// (Postgres `$1..$N`; SQLite / MySQL keep `?`). Quote / comment-aware single
-// pass - a `?` inside a string literal, a quoted identifier, or a comment is
-// NOT a placeholder and is left untouched. This is the toExternalSql terminal
-// for code that hands the SQL to an operator-supplied driver directly (no
-// clusterStorage in the path to do the rewrite). The translator lives here -
-// the builder owns its driver-final output rendering - rather than reaching
-// into clusterStorage (which transitively requires this module).
-function _toPositional(sql, dialect) {
-  if (dialect !== "postgres") return sql;
-  var out = "";
-  var n = 0;
-  var i = 0;
-  var len = sql.length;
-  while (i < len) {
-    var c = sql.charAt(i);
-    var nx = i + 1 < len ? sql.charAt(i + 1) : "";
-    if (c === "'" || c === '"' || c === "`") {
-      out += c;
-      i += 1;
-      while (i < len) {
-        var q = sql.charAt(i);
-        if (q === c) {
-          if (sql.charAt(i + 1) === c) { out += c + c; i += 2; continue; }
-          out += c; i += 1; break;
-        }
-        out += q; i += 1;
-      }
-      continue;
-    }
-    if (c === "-" && nx === "-") {
-      while (i < len && sql.charAt(i) !== "\n") { out += sql.charAt(i); i += 1; }
-      continue;
-    }
-    if (c === "/" && nx === "*") {
-      out += "/*"; i += 2;
-      while (i < len && !(sql.charAt(i) === "*" && sql.charAt(i + 1) === "/")) { out += sql.charAt(i); i += 1; }
-      if (i < len) { out += "*/"; i += 2; }
-      continue;
-    }
-    if (c === "?") { n += 1; out += "$" + n; i += 1; continue; }
-    out += c;
-    i += 1;
-  }
-  return out;
-}
+// (Postgres `$1..$N`; SQLite / MySQL keep `?`); composed from safe-sql so the
+// quote / comment / backtick skip rules live in one place. The toExternalSql
+// terminal for code that hands the SQL to an operator-supplied driver directly.
+var _toPositional = safeSql.toPositional;
 
 /**
  * @primitive  b.sql.toExternalSql
@@ -1922,6 +1853,163 @@ class InsertBuilder extends Builder {
   }
 }
 
+// ---- INSERT ... SELECT ... WHERE (conditional / append-only) --------
+//
+// A conditional INSERT that materialises its row from a value-less SELECT
+// guarded by a WHERE - INSERT INTO t (cols) SELECT <cells> WHERE <guard>.
+// The append-only-ledger debit idiom: the new row is written ONLY when a
+// guard derived from the table itself holds (a store-credit / gift-card /
+// points / metered-quota balance that lives on the latest row, with no
+// mutable counter row to increment()). The SELECT has no FROM - it is a
+// single computed row that the WHERE either admits (one row inserted) or
+// rejects (zero rows), evaluated atomically inside the INSERT against the
+// table the guard's correlated subquery / EXISTS references, so two racing
+// debits cannot both pass the balance check.
+//
+// Standard-SQL across sqlite / Postgres / MySQL - the only dialect-divergent
+// clause is RETURNING (Postgres / SQLite; refused on MySQL by the shared
+// _renderReturning, which the MySQL caller replaces with an explicit read).
+// Every SELECT cell routes through the SAME _renderValueCell choke-point
+// INSERT VALUES uses (so a cell is a bound ?, a b.sql.cast(...) ?::type, or a
+// b.sql.fn(...) allowlisted server function - no param), and the guard is a
+// full Predicate (the whole where-family: whereExists / whereSub / whereOp /
+// whereRaw / whereGroup compose, which is how a balance fence is expressed).
+//
+// Safety default: an INSERT...SELECT with no WHERE is just an INSERT...VALUES
+// and shipping it un-guarded is almost always a bug, so the verb THROWS
+// without a where() unless allowNoWhere() opts in - the same discipline
+// update / delete apply.
+class InsertSelectWhereBuilder extends Builder {
+  constructor(tableNameOrRef, opts) {
+    super("insert-select-where", tableNameOrRef, opts);
+    this._columns = null;
+    this._values = null;          // single row, aligned to _columns
+    this._where = new Predicate(this, "AND");
+    this._returning = null;
+    this._allowNoWhere = false;
+  }
+
+  // Declare the target column list (validated + gated). values() infers it
+  // from a row object's keys when omitted, exactly like INSERT.
+  columns(cols) {
+    if (!Array.isArray(cols) || cols.length === 0) {
+      throw _err("columns() expects a non-empty array", "sql-builder/bad-columns");
+    }
+    var self = this;
+    cols.forEach(function (c) { self._assertColumnMember(c, "insertSelectWhere"); _validateColumn(c); });
+    this._columns = cols.slice();
+    return this;
+  }
+
+  // values(obj) - one row from a column->value map (sets _columns from the
+  // keys when not already declared). values(array) - one positional row
+  // aligned to a prior columns() call. A single row only: the SELECT
+  // materialises exactly one candidate row gated by the WHERE.
+  values(rowOrArray) {
+    if (Array.isArray(rowOrArray)) {
+      if (this._columns === null) {
+        throw _err("values(array) requires a prior columns([...]) call", "sql-builder/no-columns");
+      }
+      if (rowOrArray.length !== this._columns.length) {
+        throw _err("values(array): " + rowOrArray.length + " values but " +
+          this._columns.length + " columns", "sql-builder/value-count");
+      }
+      this._values = rowOrArray.slice();
+      return this;
+    }
+    if (rowOrArray && typeof rowOrArray === "object") {
+      var keys = Object.keys(rowOrArray);
+      if (keys.length === 0) throw _err("insertSelectWhere row object is empty", "sql-builder/empty-values");
+      if (this._columns === null) this.columns(keys);
+      var self = this;
+      this._values = this._columns.map(function (c) {
+        if (!Object.prototype.hasOwnProperty.call(rowOrArray, c)) {
+          throw _err("insertSelectWhere row is missing column '" + c + "'", "sql-builder/missing-column");
+        }
+        return rowOrArray[c];
+      });
+      keys.forEach(function (k) {
+        if (self._columns.indexOf(k) === -1) {
+          throw _err("insertSelectWhere row has column '" + k + "' not in the column set",
+            "sql-builder/extra-column");
+        }
+      });
+      return this;
+    }
+    throw _err("insertSelectWhere values() requires a row object or a value array aligned to columns()",
+      "sql-builder/bad-values");
+  }
+
+  // A deliberate un-guarded conditional insert opts in here - same shape as
+  // update / delete. Without it the verb refuses an empty WHERE.
+  allowNoWhere() { this._allowNoWhere = true; return this; }
+
+  where() { this._where.where.apply(this._where, arguments); return this; }
+  andWhere() { this._where.andWhere.apply(this._where, arguments); return this; }
+  orWhere() { this._where.orWhere.apply(this._where, arguments); return this; }
+  whereOp(col, op, value) { this._where.whereOp(col, op, value); return this; }
+  orWhereOp(col, op, value) { this._where.orWhereOp(col, op, value); return this; }
+  whereIn(col, values) { this._where.whereIn(col, values); return this; }
+  whereNotIn(col, values) { this._where.whereNotIn(col, values); return this; }
+  orWhereIn(col, values) { this._where.orWhereIn(col, values); return this; }
+  whereInArray(col, values) { this._where.whereInArray(col, values); return this; }
+  orWhereInArray(col, values) { this._where.orWhereInArray(col, values); return this; }
+  whereInJsonEach(col, jsonArrayString) { this._where.whereInJsonEach(col, jsonArrayString); return this; }
+  whereMatch(target, expr) { this._where.whereMatch(target, expr); return this; }
+  whereNull(col) { this._where.whereNull(col); return this; }
+  whereNotNull(col) { this._where.whereNotNull(col); return this; }
+  orWhereNull(col) { this._where.orWhereNull(col); return this; }
+  whereLike(col, term, mode) { this._where.whereLike(col, term, mode); return this; }
+  orWhereLike(col, term, mode) { this._where.orWhereLike(col, term, mode); return this; }
+  whereBetween(col, low, high) { this._where.whereBetween(col, low, high); return this; }
+  whereSub(col, op, sub) { this._where.whereSub(col, op, sub); return this; }
+  whereExists(sub) { this._where.whereExists(sub); return this; }
+  whereNotExists(sub) { this._where.whereNotExists(sub); return this; }
+  orWhereExists(sub) { this._where.orWhereExists(sub); return this; }
+  whereGroup(closure) { this._where.whereGroup(closure); return this; }
+  orWhereGroup(closure) { this._where.orWhereGroup(closure); return this; }
+  whereRaw(sql, params, opts) { this._where.whereRaw(sql, params, opts); return this; }
+  orWhereRaw(sql, params, opts) { this._where.orWhereRaw(sql, params, opts); return this; }
+
+  returning(cols) { this._returning = _normReturning(cols); return this; }
+
+  _render() {
+    if (this._columns === null || this._values === null) {
+      throw _err("insertSelectWhere requires columns + a values() row", "sql-builder/empty-values");
+    }
+    if (this._where.length === 0 && !this._allowNoWhere) {
+      throw _err("refusing unconditional insertSelectWhere - call where(...) first or " +
+        "allowNoWhere() (an un-guarded INSERT...SELECT is just INSERT...VALUES)",
+        "sql-builder/no-where");
+    }
+    var dialect = this._dialect;
+    var params = [];
+    var quotedCols = this._columns.map(function (c) { return _quoteId(c, dialect); }).join(", ");
+
+    // Each SELECT cell renders through the same choke-point INSERT VALUES
+    // uses: `?` (bound), `?::type` (cast), or an allowlisted server-function
+    // token (NOW() / CURRENT_TIMESTAMP - no param).
+    var cells = [];
+    for (var v = 0; v < this._values.length; v += 1) {
+      var rendered = _renderValueCell(this._values[v], dialect);
+      cells.push(rendered.sql);
+      for (var rp = 0; rp < rendered.params.length; rp += 1) params.push(rendered.params[rp]);
+    }
+
+    var sql = "INSERT INTO " + this._table.ref(dialect) + " (" + quotedCols + ") SELECT " +
+      cells.join(", ");
+
+    var w = this._where.build();
+    if (w.sql) {
+      sql += " WHERE " + w.sql;
+      for (var wi = 0; wi < w.params.length; wi += 1) params.push(w.params[wi]);
+    }
+
+    sql += _renderReturning(this._returning, dialect);
+    return _emit(sql, params);
+  }
+}
+
 // ---- UPDATE ---------------------------------------------------------
 
 class UpdateBuilder extends Builder {
@@ -3431,7 +3519,7 @@ var catalog = Object.freeze({
  *   b.sql.pragma("journal_mode").sql;             // -> 'PRAGMA journal_mode'  (read)
  */
 function pragma(verb, arg) {
-  if (typeof verb !== "string" || CATALOG_PRAGMA_VERBS[verb] === undefined) {
+  if (typeof verb !== "string" || !Object.prototype.hasOwnProperty.call(CATALOG_PRAGMA_VERBS, verb)) {
     throw _err("pragma: verb '" + verb + "' is not on the allowlist (journal_mode / " +
       "synchronous / wal_checkpoint); a PRAGMA outside this set is refused by design",
       "sql-builder/bad-pragma");
@@ -3699,6 +3787,64 @@ function select(tableNameOrRef, opts) { return new SelectBuilder(tableNameOrRef,
  */
 function insert(tableNameOrRef, opts) { return new InsertBuilder(tableNameOrRef, opts); }
 
+/**
+ * @primitive  b.sql.insertSelectWhere
+ * @signature  b.sql.insertSelectWhere(table, opts?)
+ * @since      0.15.13
+ * @status     stable
+ * @related    b.sql.insert, b.sql.upsert, b.sql.update
+ *
+ * Start a conditional `INSERT ... SELECT ... WHERE` builder - a row written
+ * ONLY when a guard derived from the table itself holds. Emits
+ * `INSERT INTO t (cols) SELECT <cells> WHERE <guard>`: the value-less SELECT
+ * is a single computed candidate row the WHERE either admits (one row
+ * inserted) or rejects (zero rows). It is the race-free append-only-ledger
+ * debit - a store-credit / gift-card / wallet / points / metered-quota /
+ * seat-counter balance that lives only on the latest row, with no mutable
+ * counter row to `increment()`. The guard's correlated subquery / `EXISTS`
+ * is evaluated atomically inside the INSERT, so two concurrent debits cannot
+ * both pass the same balance check.
+ *
+ * Supply the row via `columns([...])` + `values([...])` (positional),
+ * `values({ ... })` (one row object, inferring the column list from its
+ * keys), then the guard via the full `where` family (`whereExists` /
+ * `whereSub` / `whereOp` / `whereGroup` / `whereRaw` all compose - the
+ * balance fence is typically an `EXISTS` against the same table). Each SELECT
+ * cell routes through the same choke-point INSERT `values()` uses, so a cell
+ * may be a bound `?`, a `b.sql.cast(...)` (`?::type`), or a `b.sql.fn(...)`
+ * allowlisted server function (`NOW()`, no param). Standard SQL across sqlite
+ * / Postgres / MySQL; only `RETURNING` diverges (Postgres / SQLite - refused
+ * on MySQL, run an explicit read).
+ *
+ * Safety default: an INSERT...SELECT with no WHERE is just an
+ * INSERT...VALUES, so the verb THROWS without a `where()` unless
+ * `allowNoWhere()` opts in - the same discipline `update` / `delete` apply.
+ *
+ * @opts
+ *   dialect:         string,   // postgres | sqlite | mysql (default sqlite)
+ *   schema:          string,   // schema qualifier
+ *   prefix:          string,   // operator app-table namespace prefix
+ *   allowedColumns:  array,    // column-membership gate set
+ *
+ * @example
+ *   // Append a -25 debit ONLY if the wallet's balance row still covers it -
+ *   // a race-free conditional insert with no read-modify-write. The guard is
+ *   // an EXISTS over a same-dialect sub-builder (no raw statement verb).
+ *   var covered = b.sql.select("wallet", { dialect: "postgres" })
+ *     .selectRaw("1")
+ *     .whereRaw('"id" = ? AND "balance" >= ?', ["w-1", 25]);
+ *   b.sql.insertSelectWhere("wallet_ledger", { dialect: "postgres" })
+ *     .values({ wallet_id: "w-1", amount: -25, at: b.sql.fn("NOW") })
+ *     .whereExists(covered)
+ *     .returning(["id"])
+ *     .toSql();
+ *   // -> { sql: 'INSERT INTO wallet_ledger ("wallet_id", "amount", "at") ' +
+ *   //          'SELECT ?, ?, NOW() WHERE EXISTS (SELECT 1 FROM wallet ' +
+ *   //          'WHERE ("id" = ? AND "balance" >= ?)) RETURNING "id"',
+ *   //     params: ["w-1", -25, "w-1", 25] }
+ */
+function insertSelectWhere(tableNameOrRef, opts) { return new InsertSelectWhereBuilder(tableNameOrRef, opts); }
+
 /**
  * @primitive  b.sql.update
  * @signature  b.sql.update(table, opts?)
@@ -3806,6 +3952,7 @@ module.exports = {
   // Verbs
   select:        select,
   insert:        insert,
+  insertSelectWhere: insertSelectWhere,
   update:        update,
   delete:        del,
   upsert:        upsert,

package/lib/sse.js

@@ -76,6 +76,8 @@
 
 var C = require("./constants");
 var audit = require("./audit");
+var validateOpts = require("./validate-opts");
+var numericBounds = require("./numeric-bounds");
 var { SseError } = require("./framework-error");
 
 // Per W3C SSE — the wire format uses LF as terminator. A single LF
@@ -228,10 +230,8 @@ function _readLastEventId(req) {
 function create(req, res, opts) {
   opts = opts || {};
   var errorClass = opts.errorClass || SseError;
-  if (!res || typeof res.write !== "function" || typeof res.end !== "function") {
-    throw errorClass.factory("sse/bad-res",
-      "sse.create: res must be a writable response stream");
-  }
+  validateOpts.requireMethods(res, ["write", "end"],
+    "sse.create: res (writable response stream)", errorClass, "sse/bad-res");
   var heartbeatMs = opts.heartbeatMs;
   if (heartbeatMs === undefined) heartbeatMs = C.TIME.seconds(15);
   if (typeof heartbeatMs !== "number" || !isFinite(heartbeatMs) ||
@@ -255,12 +255,8 @@ function create(req, res, opts) {
   // never affected. Config-time input → throw on a bad value.
   var maxBufferedBytes = opts.maxBufferedBytes;
   if (maxBufferedBytes === undefined) maxBufferedBytes = C.BYTES.mib(1);
-  if (typeof maxBufferedBytes !== "number" || !isFinite(maxBufferedBytes) ||
-      maxBufferedBytes <= 0 || Math.floor(maxBufferedBytes) !== maxBufferedBytes) {
-    throw errorClass.factory("sse/bad-opts",
-      "sse.create: maxBufferedBytes must be a positive integer byte count (got " +
-      JSON.stringify(maxBufferedBytes) + ")");
-  }
+  numericBounds.requirePositiveFiniteInt(maxBufferedBytes,
+    "sse.create: maxBufferedBytes", errorClass, "sse/bad-opts");
 
   var lastEventId = _readLastEventId(req);