@ai0x0/utils 0.5.0 → 0.6.1

package/es/backend/actions/get-list-query.js

@@ -1,223 +1,23 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _templateObject, _templateObject2, _templateObject3;
-var _excluded = ["page", "pageSize", "orderBy", "orderDir"];
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var _templateObject;
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { and, asc, desc, eq, gte, ilike, inArray, lte, or, sql } from "drizzle-orm";
-import { scopeCondition } from "../scope.js";
-export function getListQuery(_ref) {
-  var db = _ref.db,
-    fields = _ref.fields,
-    jsonArrayFields = _ref.jsonArrayFields,
-    params = _ref.params,
-    relations = _ref.relations,
-    scope = _ref.scope,
-    table = _ref.table;
-  var _params$page = params.page,
-    page = _params$page === void 0 ? 1 : _params$page,
-    _params$pageSize = params.pageSize,
-    pageSize = _params$pageSize === void 0 ? 10 : _params$pageSize,
-    _params$orderBy = params.orderBy,
-    orderBy = _params$orderBy === void 0 ? "createdAt" : _params$orderBy,
-    _params$orderDir = params.orderDir,
-    orderDir = _params$orderDir === void 0 ? "desc" : _params$orderDir,
-    filters = _objectWithoutProperties(params, _excluded);
-
-  // 构建基础查询
-  function buildBaseQuery(table, fields, relations) {
-    var queryFields = _objectSpread({}, fields);
-
-    // 添加关联字段
-    if (relations !== null && relations !== void 0 && relations.length) {
-      var _iterator = _createForOfIteratorHelper(relations),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var select = _step.value.select;
-          queryFields = _objectSpread(_objectSpread({}, queryFields), select);
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-    }
-    var query = db.select(queryFields).from(table);
-
-    // 添加分组
-    if (relations !== null && relations !== void 0 && relations.length) {
-      query.groupBy.apply(query, [table.id].concat(_toConsumableArray(relations.filter(function (_ref2) {
-        var groupBy = _ref2.groupBy;
-        return groupBy;
-      }).filter(function (_ref3) {
-        var table = _ref3.table;
-        return table;
-      }).map(function (_ref4) {
-        var table = _ref4.table;
-        return table.id;
-      }))));
-    }
-    return query;
-  }
-
-  // 查找目标列
-  function findTargetColumn(key, table, relations) {
-    var _concat$find;
-    return (_concat$find = [table].concat((relations === null || relations === void 0 ? void 0 : relations.filter(function (_ref5) {
-      var table = _ref5.table;
-      return table;
-    }).map(function (_ref6) {
-      var table = _ref6.table;
-      return table;
-    })) || []).find(function (table) {
-      return table[key];
-    })) === null || _concat$find === void 0 ? void 0 : _concat$find[key];
-  }
-
-  // 添加条件
-  function addCondition(conditions, key, value, targetColumn) {
-    var isIdField = /id/i.test(key);
-    var isJsonArray = jsonArrayFields === null || jsonArrayFields === void 0 ? void 0 : jsonArrayFields.includes(key);
-    if (typeof value === "string") {
-      if (value.includes(",")) {
-        // 处理多值
-        var values = value.split(",").map(function (val) {
-          return val.trim();
-        }).filter(Boolean);
-        if (values.length > 0) {
-          if (isJsonArray) {
-            // 处理JSONB数组字段
-            conditions.push(sql(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                EXISTS (\n                  SELECT 1 FROM jsonb_array_elements_text(", ") tag\n                  WHERE tag LIKE ", "\n                )\n              "])), targetColumn, "%".concat(values[0], "%")));
-          } else if (isIdField) {
-            conditions.push(inArray(targetColumn, values));
-          } else {
-            conditions.push(or.apply(void 0, _toConsumableArray(values.map(function (val) {
-              return ilike(targetColumn, "%".concat(val, "%"));
-            }))));
-          }
-        }
-      } else {
-        // 处理单值
-        if (isJsonArray) {
-          // 处理JSONB数组字段
-          conditions.push(sql(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n              EXISTS (\n                SELECT 1 FROM jsonb_array_elements_text(", ") tag\n                WHERE tag LIKE ", "\n              )\n            "])), targetColumn, "%".concat(value, "%")));
-        } else if (isIdField) {
-          conditions.push(eq(targetColumn, value));
-        } else {
-          conditions.push(ilike(targetColumn, "%".concat(value, "%")));
-        }
-      }
-    } else {
-      conditions.push(eq(targetColumn, value));
-    }
-  }
-
-  // 构建查询条件
-  function buildConditions(filters, table, relations) {
-    var conditions = [];
-
-    // 处理过滤条件
-    for (var _i = 0, _Object$entries = Object.entries(filters); _i < _Object$entries.length; _i++) {
-      var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-        key = _Object$entries$_i[0],
-        value = _Object$entries$_i[1];
-      if (!value) {
-        continue;
-      }
-
-      // 处理日期范围字段
-      if (key.endsWith("AtFrom") || key.endsWith("AtTo")) {
-        var baseFieldName = key.replace(/(AtFrom|AtTo)$/, "");
-        var _targetColumn = findTargetColumn("".concat(baseFieldName, "At"), table, relations);
-        if (!_targetColumn) {
-          continue;
-        }
-        if (key.endsWith("AtFrom")) {
-          conditions.push(gte(_targetColumn, new Date(value)));
-        } else if (key.endsWith("AtTo")) {
-          conditions.push(lte(_targetColumn, new Date(value)));
-        }
-        continue;
-      }
-
-      // 处理其他普通过滤条件
-      var targetColumn = findTargetColumn(key, table, relations);
-      if (!targetColumn) {
-        continue;
-      }
-      addCondition(conditions, key, value, targetColumn);
-    }
-    return conditions;
+// ==============================================================================
+// 列表查询（Postgres）
+// ==============================================================================
+// 实现在 get-list-query-core，两套方言共用。这里只给它两条 pg 专属的原语，外加把签名收紧到
+// pg 的类型上 —— 核心为了同时喂 sqlite，db 那一栏是宽的，调用方不该跟着变宽。
+
+import { ilike, sql } from "drizzle-orm";
+import { createGetListQuery } from "./get-list-query-core.js";
+var run = createGetListQuery({
+  contains: function contains(column, keyword) {
+    return ilike(column, "%".concat(keyword, "%"));
+  },
+  // jsonb 数组展开成行再逐个 LIKE。列存的是 text[] 形状的 jsonb（见 createTableSchema 的
+  // jsonArrayFields），所以用 _text 那个变体，取到的 tag 直接就是字符串。
+  jsonArrayContains: function jsonArrayContains(column, keyword) {
+    return sql(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    EXISTS (\n      SELECT 1 FROM jsonb_array_elements_text(", ") tag\n      WHERE tag LIKE ", "\n    )\n  "])), column, "%".concat(keyword, "%"));
   }
-
-  // 构建排序
-  function buildOrderBy(table, orderBy, orderDir) {
-    var orderColumn = table[orderBy];
-    return orderDir === "asc" ? asc(orderColumn) : desc(orderColumn);
-  }
-
-  // 构建基础查询
-  var baseQuery = buildBaseQuery(table, fields, relations);
-
-  // 构建条件。**作用域先于筛选加进去**，且它不受 buildConditions 里「空值跳过」那条规矩管：
-  // 那条规矩对 `?name=` 这种空参数是对的，对归属则是灾难性的 —— 条件消失即全表可见。
-  var scopeSql = scopeCondition(table, scope);
-  var conditions = scopeSql ? [scopeSql] : [];
-  conditions.push.apply(conditions, _toConsumableArray(buildConditions(filters, table, relations)));
-
-  // 构建主查询
-  var query = baseQuery.where(conditions.length > 0 ? and.apply(void 0, conditions) : undefined).orderBy(buildOrderBy(table, orderBy, orderDir))
-
-  // @ts-ignore
-  .limit(pageSize).offset((page - 1) * pageSize);
-
-  // 构建计数查询(优化后)
-  var countQuery = db.select({
-    count: sql(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["COUNT(DISTINCT ", ")"])), table.id)
-  }).from(table).where(conditions.length > 0 ? and.apply(void 0, conditions) : undefined);
-
-  // 添加关联
-  if (relations !== null && relations !== void 0 && relations.length) {
-    var _iterator2 = _createForOfIteratorHelper(relations),
-      _step2;
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var _step2$value = _step2.value,
-          relationTable = _step2$value.table,
-          joinSql = _step2$value.sql;
-        if (relationTable) {
-          query.leftJoin(relationTable, joinSql);
-          countQuery.leftJoin(relationTable, joinSql);
-        }
-      }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
-    }
-  }
-
-  // console.log(query.prepare("a").getQuery());
-
-  return {
-    countQuery: countQuery,
-    query: query
-  };
+});
+export function getListQuery(args) {
+  return run(args);
 }

package/es/backend/actions/write-action-core.d.ts

@@ -0,0 +1,18 @@
+import { ScopeArg } from "../scope.js";
+/** 核心用得到表的哪一部分：只有 id。dialect 各自的 Table 类型不进来。 */
+export interface WriteActionTable {
+    id: unknown;
+}
+interface WriteActionDeps<TTable extends WriteActionTable> {
+    db: any;
+    table: TTable;
+}
+export declare function createPutActionCore<TTable extends WriteActionTable>({ db, table, }: WriteActionDeps<TTable>): (body: Record<string, unknown>, { scope }: {
+    scope: ScopeArg;
+}) => Promise<unknown>;
+export declare function createDeleteActionCore<TTable extends WriteActionTable>({ db, table, }: WriteActionDeps<TTable>): ({ id }: {
+    id: string;
+}, { scope }: {
+    scope: ScopeArg;
+}) => Promise<any>;
+export {};

package/es/backend/actions/write-action-core.js

@@ -0,0 +1,119 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+// ==============================================================================
+// 单行写操作的公共实现（pg / sqlite 共用）
+// ==============================================================================
+// 改一行、删一行，两套方言的函数体逐字相同 —— 差的只有 db 的类型（NodePgDatabase vs any）
+// 和一句给 scopeCondition 的断言。而这两个函数里恰恰藏着三条**安全性质**，抄两份意味着
+// 三条都要在两棵树上各维护一遍：
+//
+//   1. **归属写进 where，不先查后改**。先查一次确认归属、再无条件写，中间那一瞬归属可能已经
+//      变了（转移给团队、被踢出成员）；一条语句里带上归属，改不到就是改不到。
+//   2. **作用域必填**（不隔离要显式传 NO_SCOPE）。这里原先是可选的 creatorId + `if (有值)
+//      才校验`，于是未登录传下来的空值直接变成「不校验、按 id 删任意行」。
+//   3. **不区分「不存在」与「不归你」**。分得清就等于给了一个探测接口：拿 id 挨个试就能问出
+//      某条记录存不存在。
+//
+// 这三条现在只有一份。两个方言各自的薄封装只负责把签名收紧回本方言的类型。
+
+import { and, eq } from "drizzle-orm";
+import { NO_SCOPE, scopeCondition } from "../scope.js";
+import { HttpError } from "../errors.js";
+import { transformBody } from "./transform-body.js";
+
+/** 核心用得到表的哪一部分：只有 id。dialect 各自的 Table 类型不进来。 */
+
+// id 那一列在两边都是 Column，但类型不同；比较条件交给 drizzle 自己去解。
+function byId(table, id, scope) {
+  var guard = scopeCondition(table, scope);
+  var same = eq(table.id, id);
+  return guard ? and(same, guard) : same;
+}
+export function createPutActionCore(_ref) {
+  var db = _ref.db,
+    table = _ref.table;
+  return /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(body, _ref2) {
+      var scope, id, _yield$db$update$set$, _yield$db$update$set$2, data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            scope = _ref2.scope;
+            id = body.id;
+            if (id) {
+              _context.next = 4;
+              break;
+            }
+            throw new HttpError(400, "缺少 id");
+          case 4:
+            _context.next = 6;
+            return db.update(table).set(transformBody(body)).where(byId(table, id, scope)).returning();
+          case 6:
+            _yield$db$update$set$ = _context.sent;
+            _yield$db$update$set$2 = _slicedToArray(_yield$db$update$set$, 1);
+            data = _yield$db$update$set$2[0];
+            if (!(!data && scope !== NO_SCOPE)) {
+              _context.next = 11;
+              break;
+            }
+            throw new HttpError(404, "未找到编辑对象，或没有权限");
+          case 11:
+            return _context.abrupt("return", data);
+          case 12:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x, _x2) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+}
+export function createDeleteActionCore(_ref4) {
+  var db = _ref4.db,
+    table = _ref4.table;
+  return /*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5, _ref6) {
+      var id, scope, rows;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            id = _ref5.id;
+            scope = _ref6.scope;
+            if (id) {
+              _context2.next = 4;
+              break;
+            }
+            throw new HttpError(400, "缺少 id");
+          case 4:
+            _context2.next = 6;
+            return db.delete(table).where(byId(table, id, scope)).returning();
+          case 6:
+            rows = _context2.sent;
+            if (!(rows.length === 0 && scope !== NO_SCOPE)) {
+              _context2.next = 9;
+              break;
+            }
+            throw new HttpError(404, "未找到删除对象，或没有权限");
+          case 9:
+            return _context2.abrupt("return", rows);
+          case 10:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function (_x3, _x4) {
+      return _ref7.apply(this, arguments);
+    };
+  }();
+}

package/es/backend/route-operation/operation-common.d.ts

@@ -8,6 +8,18 @@ export type RouteCatch = (error: Error) => Promise<JsonResponse | undefined>;
 export interface DefaultSession {
     userId?: string;
 }
+/**
+ * 「这次请求是谁发的」。四个方法都会把它盖进 params.callerId，自定义 handler 判权、署名、
+ * 判「是不是本人」一律读它。
+ *
+ * **不要拿 params.creatorId 当调用者用。** 那是另一件事：POST 上的 creatorId 是**归属戳**
+ * （access.scope 指的那一列，换成 ownerId 时它就不叫 creatorId 了），PUT 上的 editorId 是要
+ * 写进行里的**审计列**。两者都恰好等于调用者只是默认配置下的巧合。
+ *
+ * 会话形状是泛型的（调用方可以塞自己的 Scope 进来），所以这里按 DefaultSession 取 userId ——
+ * 自定义会话只要带着这个字段就通用。
+ */
+export declare function callerIdOf(session: unknown): string | undefined;
 /**
  * 会话读取器。泛型化是为了让调用方能在这里一次性解析出「你是谁 + 你现在站在哪个空间 +
  * 你在那个空间里是什么角色」，后面 access.scope / access.can 都读同一份，不必各自再查一遍库。
@@ -99,7 +111,7 @@ export declare function getDefaultTags<TTable>({ getTableName, table, }: {
     table?: TTable;
 }): string[];
 export type GetOperationParams<Q extends ZodSchema> = z.infer<Q> & Record<string, unknown> & {
-    creatorId?: string;
+    callerId?: string;
 };
 /**
  * 读操作的参数与作用域。

package/es/backend/route-operation/operation-common.js

@@ -17,6 +17,21 @@ import { isEmptyScopeValue, NO_SCOPE } from "../scope.js";
 
 /** 默认的会话形状。够用于「一条记录属于一个人」的场景。 */
 
+/**
+ * 「这次请求是谁发的」。四个方法都会把它盖进 params.callerId，自定义 handler 判权、署名、
+ * 判「是不是本人」一律读它。
+ *
+ * **不要拿 params.creatorId 当调用者用。** 那是另一件事：POST 上的 creatorId 是**归属戳**
+ * （access.scope 指的那一列，换成 ownerId 时它就不叫 creatorId 了），PUT 上的 editorId 是要
+ * 写进行里的**审计列**。两者都恰好等于调用者只是默认配置下的巧合。
+ *
+ * 会话形状是泛型的（调用方可以塞自己的 Scope 进来），所以这里按 DefaultSession 取 userId ——
+ * 自定义会话只要带着这个字段就通用。
+ */
+export function callerIdOf(session) {
+  return session === null || session === void 0 ? void 0 : session.userId;
+}
+
 /**
  * 会话读取器。泛型化是为了让调用方能在这里一次性解析出「你是谁 + 你现在站在哪个空间 +
  * 你在那个空间里是什么角色」，后面 access.scope / access.can 都读同一份，不必各自再查一遍库。
@@ -245,6 +260,13 @@ export function getDefaultTags(_ref3) {
 // 读操作的参数
 // ==============================================================================
 
+// callerId 是服务端盖的，**不是** query 里来的：调用方在地址栏上写 `?callerId=别人`
+// 覆盖不了它（下面 getReadParams 里它最后展开）。
+//
+// 这里原先声明的是 `creatorId?: string`，而读操作从来没有填过它 —— 类型说有、运行时没有，
+// 于是 `if (!params.creatorId) throw 401` 这种判权写法编译绿灯、线上对所有人 401。
+// 那个字段已经删掉：要调用者就用 callerId，要按创建者筛就在 query schema 里显式声明一个。
+
 /**
  * 读操作的参数与作用域。
  *
@@ -284,6 +306,9 @@ function _getReadParams() {
           session = _yield$resolveAccess.session;
           queryParams = schemas.query.parse(Object.fromEntries(new URL(req.url).searchParams));
           return _context4.abrupt("return", {
+            // 这一份**不带 callerId**：它会被当成筛选条件送进查询构造器，而 callerId 不是任何表的列。
+            // 列表那边认不出的键会跳过（get-list-query 的 `if (!targetColumn) continue`），但别指望
+            // 这条兜底 —— 交给 handler 的那一份在 read-operation-core 里单独拼，见那里。
             params: _objectSpread(_objectSpread({}, queryParams), extraParams),
             scope: scope,
             session: session