@ai0x0/utils 0.5.0 → 0.6.1

package/es/backend/actions/create-delete-action.d.ts

@@ -1,11 +1,10 @@
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { BaseTable } from "../types.js";
-import { ScopeArg } from "../scope.js";
 export declare function createDeleteAction<TTable extends BaseTable>({ table, db, }: {
     db: NodePgDatabase<Record<string, unknown>>;
     table: TTable;
 }): ({ id }: {
     id: string;
 }, { scope }: {
-    scope: ScopeArg;
-}) => Promise<TTable["$inferSelect"] extends infer T ? T extends TTable["$inferSelect"] ? T extends undefined ? QueryResult<import("drizzle-orm").Assume<this["row"], QueryResultRow>> : T[] : never : never>;
+    scope: import("..").ScopeArg;
+}) => Promise<any>;

package/es/backend/actions/create-delete-action.js

@@ -1,48 +1,12 @@
-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 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); }); }; }
-import { and, eq } from "drizzle-orm";
-import { NO_SCOPE, scopeCondition } from "../scope.js";
-import { HttpError } from "../errors.js";
+// 删一行。实现（含三条安全性质：归属写进 where、作用域必填、不区分「不存在」与「不归你」）
+// 在 write-action-core，与 sqlite 共用。
+
+import { createDeleteActionCore } from "./write-action-core.js";
 export function createDeleteAction(_ref) {
   var table = _ref.table,
     db = _ref.db;
-  return /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2, _ref3) {
-      var id, scope, guard, rows;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            id = _ref2.id;
-            scope = _ref3.scope;
-            if (id) {
-              _context.next = 4;
-              break;
-            }
-            throw new HttpError(400, "缺少 id");
-          case 4:
-            // 归属写进 DELETE 的 where，不先查后删（理由同 create-put-action）。
-            guard = scopeCondition(table, scope);
-            _context.next = 7;
-            return db.delete(table).where(guard ? and(eq(table.id, id), guard) : eq(table.id, id)).returning();
-          case 7:
-            rows = _context.sent;
-            if (!(rows.length === 0 && scope !== NO_SCOPE)) {
-              _context.next = 10;
-              break;
-            }
-            throw new HttpError(404, "未找到删除对象，或没有权限");
-          case 10:
-            return _context.abrupt("return", rows);
-          case 11:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function (_x, _x2) {
-      return _ref4.apply(this, arguments);
-    };
-  }();
+  return createDeleteActionCore({
+    db: db,
+    table: table
+  });
 }

package/es/backend/actions/create-put-action.d.ts

@@ -6,6 +6,6 @@ export declare function createPutAction<T extends ZodSchema, TTable extends Base
     bodySchema: T;
     db: NodePgDatabase<Record<string, unknown>>;
     table: TTable;
-}): (body: Partial<z.infer<T>> & Record<string, unknown>, { scope }: {
+}): (body: Partial<z.infer<T>> & Record<string, unknown>, options: {
     scope: ScopeArg;
 }) => Promise<z.infer<T>>;

package/es/backend/actions/create-put-action.js

@@ -1,59 +1,35 @@
 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); }); }; }
-import { transformBody } from "./transform-body.js";
-import { and, eq } from "drizzle-orm";
-import { NO_SCOPE, scopeCondition } from "../scope.js";
-import { HttpError } from "../errors.js";
+// 改一行。实现（含三条安全性质）在 write-action-core，与 sqlite 共用；这里只把签名收紧到
+// pg 的类型上 —— 核心为了同时喂两套方言，db 与返回值那两栏是宽的，调用方不该跟着变宽。
+
+import { createPutActionCore } from "./write-action-core.js";
 export function createPutAction(_ref) {
   var db = _ref.db,
     table = _ref.table;
+  var run = createPutActionCore({
+    db: db,
+    table: table
+  });
   return /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(body, _ref2) {
-      var scope, id, guard, _yield$db$update$set$, _yield$db$update$set$2, data;
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(body, options) {
       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:
-            // 归属条件直接写进 UPDATE 的 where，而不是「先查一次确认归属、再无条件更新」。
-            // 先查后改有两个问题：多一次往返，以及那一查一改之间归属可能已经变了（转移给团队、
-            // 踢出成员）。一条语句里带上归属，改不到就是改不到。
-            guard = scopeCondition(table, scope);
-            _context.next = 7;
-            return db.update(table).set(transformBody(body)).where(guard ? and(eq(table.id, id), guard) : eq(table.id, id)).returning();
-          case 7:
-            _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 = 12;
-              break;
-            }
-            throw new HttpError(404, "未找到编辑对象，或没有权限");
-          case 12:
-            return _context.abrupt("return", data);
-          case 13:
+            _context.next = 2;
+            return run(body, options);
+          case 2:
+            return _context.abrupt("return", _context.sent);
+          case 3:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
     return function (_x, _x2) {
-      return _ref3.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 }

package/es/backend/actions/get-list-query-core.d.ts

@@ -0,0 +1,46 @@
+import { Column, SQL } from "drizzle-orm";
+import { ScopeArg } from "../scope.js";
+/**
+ * 核心用得到表的哪一部分：只有 `id`（计数与分组要它）和「按列名取列」。
+ * 两棵树的 BaseTable 都满足它，而 dialect 各自的 Table 类型不必进来。
+ */
+export interface ListQueryTable {
+    id: Column;
+}
+export interface ListQueryRelation {
+    groupBy?: boolean;
+    select?: Record<string, unknown>;
+    sql?: SQL;
+    table?: ListQueryTable;
+}
+/** 两套方言之间**全部**的差异。加第三种数据库时要写的也只有这两条。 */
+export interface ListQueryDialect {
+    /** 大小写不敏感的「包含」。 */
+    contains(_column: Column, _keyword: string): SQL;
+    /** 「这个 JSON 数组列里有没有元素含这段文字」。 */
+    jsonArrayContains(_column: Column, _keyword: string): SQL;
+}
+export interface ListQueryParams {
+    [field: string]: unknown;
+    orderBy?: string;
+    orderDir?: "asc" | "desc";
+    page?: number;
+    pageSize?: number;
+}
+export declare function createGetListQuery(dialect: ListQueryDialect): <TTable extends ListQueryTable, TSelection extends Record<string, unknown>>({ db, fields, jsonArrayFields, params, relations, scope, table, }: {
+    db: any;
+    fields: TSelection;
+    jsonArrayFields?: string[] | undefined;
+    /**
+     * 行级作用域。**必填**，不想隔离就显式传 NO_SCOPE —— 写成可选的话，漏传就退化成查全表，
+     * 而那是静默的越权（见 scope.ts）。它不走下面 params 那条筛选通道，因为那条的规矩是
+     * 「空值跳过」，一个取不到值的作用域会让整条 where 消失。
+     */
+    scope: ScopeArg;
+    params: ListQueryParams;
+    relations?: ListQueryRelation[] | undefined;
+    table: TTable;
+}) => {
+    countQuery: any;
+    query: any;
+};

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

@@ -0,0 +1,236 @@
+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;
+var _excluded = ["page", "pageSize", "orderBy", "orderDir"];
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+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; }
+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; }
+// ==============================================================================
+// 列表查询的公共实现（pg / sqlite 共用）
+// ==============================================================================
+// 从前 pg 与 sqlite 各有一份 270 行的 get-list-query，逐字相同的部分占八成 —— 筛选条件怎么拼、
+// 日期范围怎么认、多值怎么拆、排序与分页怎么加、计数查询怎么建，两边一模一样。**真正的方言
+// 差异只有两条原语**：
+//
+//   · 大小写不敏感的模糊匹配 —— pg 要 ilike，sqlite 的 like 本来就不区分大小写；
+//   · 「JSON 数组列里有没有含这段文字的元素」—— pg 用 jsonb_array_elements_text，
+//     sqlite 用 json_each（而且取值的字段名也不同：tag vs tag.value）。
+//
+// 所以这里收下一个 dialect 就够了，剩下的一份写完两边共用。与 route-operation 那边
+// createXxxOperationFactory + 薄封装是同一个套路。
+//
+// 抄两份的代价不是抽象的：这个文件改过好几次（作用域先于筛选、空值跳过、日期范围），
+// 每一次都得记得改另一棵树，而漏掉不会有任何东西报错 —— 只会让 sqlite 那边悄悄少一条规则。
+
+import { and, asc, desc, eq, gte, inArray, lte, or, sql } from "drizzle-orm";
+import { scopeCondition } from "../scope.js";
+
+/**
+ * 核心用得到表的哪一部分：只有 `id`（计数与分组要它）和「按列名取列」。
+ * 两棵树的 BaseTable 都满足它，而 dialect 各自的 Table 类型不必进来。
+ */
+
+/** 两套方言之间**全部**的差异。加第三种数据库时要写的也只有这两条。 */
+
+// 按列名从表（或它的关联表）里取列。**唯一一处按字符串索引的地方** —— 收在这儿，
+// 免得每个用到的地方都写一次断言。取不到回 undefined，调用方据此跳过这个条件。
+function columnAt(table, key) {
+  return table[key];
+}
+export function createGetListQuery(dialect) {
+  return 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() {
+      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 joined = _ref3.table;
+          return joined;
+        }).map(function (_ref4) {
+          var joined = _ref4.table;
+          return joined.id;
+        }))));
+      }
+      return query;
+    }
+
+    // 先在主表上找，找不到再去关联表上找。
+    function findTargetColumn(key) {
+      return [table].concat((relations === null || relations === void 0 ? void 0 : relations.filter(function (_ref5) {
+        var joined = _ref5.table;
+        return joined;
+      }).map(function (_ref6) {
+        var joined = _ref6.table;
+        return joined;
+      })) || []).map(function (candidate) {
+        return columnAt(candidate, key);
+      }).find(Boolean);
+    }
+
+    // ==========================================================================
+    // 单个筛选条件
+    // ==========================================================================
+    // 三条规矩，两套方言一致：
+    //   · 名字里带 id 的按精确匹配（多值走 IN），其余按模糊；
+    //   · 逗号分隔视为多值；
+    //   · JSON 数组列走 dialect 那条 EXISTS。
+    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") {
+        conditions.push(eq(targetColumn, value));
+        return;
+      }
+      if (value.includes(",")) {
+        var values = value.split(",").map(function (item) {
+          return item.trim();
+        }).filter(Boolean);
+        if (!values.length) {
+          return;
+        }
+        if (isJsonArray) {
+          // 多值时只认第一个 —— 与从前逐字一致，不趁重构改行为。
+          conditions.push(dialect.jsonArrayContains(targetColumn, values[0]));
+        } else if (isIdField) {
+          conditions.push(inArray(targetColumn, values));
+        } else {
+          conditions.push(or.apply(void 0, _toConsumableArray(values.map(function (item) {
+            return dialect.contains(targetColumn, item);
+          }))));
+        }
+        return;
+      }
+      if (isJsonArray) {
+        conditions.push(dialect.jsonArrayContains(targetColumn, value));
+      } else if (isIdField) {
+        conditions.push(eq(targetColumn, value));
+      } else {
+        conditions.push(dialect.contains(targetColumn, value));
+      }
+    }
+    function buildConditions() {
+      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;
+        }
+
+        // 日期范围：xxxAtFrom / xxxAtTo 落到 xxxAt 那一列上。
+        if (key.endsWith("AtFrom") || key.endsWith("AtTo")) {
+          var baseFieldName = key.replace(/(AtFrom|AtTo)$/, "");
+          var _targetColumn = findTargetColumn("".concat(baseFieldName, "At"));
+          if (!_targetColumn) {
+            continue;
+          }
+          conditions.push(key.endsWith("AtFrom") ? gte(_targetColumn, new Date(value)) : lte(_targetColumn, new Date(value)));
+          continue;
+        }
+        var targetColumn = findTargetColumn(key);
+        if (!targetColumn) {
+          continue;
+        }
+        addCondition(conditions, key, value, targetColumn);
+      }
+      return conditions;
+    }
+    function buildOrderBy() {
+      var orderColumn = columnAt(table, orderBy);
+      return orderDir === "asc" ? asc(orderColumn) : desc(orderColumn);
+    }
+
+    // ==========================================================================
+    // 组装
+    // ==========================================================================
+    var baseQuery = buildBaseQuery();
+
+    // **作用域先于筛选加进去**，且它不受 buildConditions 里「空值跳过」那条规矩管：
+    // 那条规矩对 `?name=` 这种空参数是对的，对归属则是灾难性的 —— 条件消失即全表可见。
+    var scopeSql = scopeCondition(table, scope);
+    var conditions = scopeSql ? [scopeSql] : [];
+    conditions.push.apply(conditions, _toConsumableArray(buildConditions()));
+    var where = conditions.length > 0 ? and.apply(void 0, conditions) : undefined;
+    var query = baseQuery.where(where).orderBy(buildOrderBy()).limit(pageSize).offset((page - 1) * pageSize);
+    var countQuery = db.select({
+      count: sql(_templateObject || (_templateObject = _taggedTemplateLiteral(["COUNT(DISTINCT ", ")"])), table.id)
+    }).from(table).where(where);
+    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();
+      }
+    }
+    return {
+      countQuery: countQuery,
+      query: query
+    };
+  };
+}

package/es/backend/actions/get-list-query.d.ts

@@ -1,34 +1,21 @@
 import { BaseTable, GetListRelations } from "../types.js";
 import { SelectedFields } from "drizzle-orm/pg-core/query-builders/select.types";
-import { SQL } from "drizzle-orm";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { ScopeArg } from "../scope.js";
-export declare function getListQuery<TTable extends BaseTable, TSelection extends SelectedFields>({ db, fields, jsonArrayFields, params, relations, scope, table, }: {
+import { type ListQueryParams } from "./get-list-query-core.js";
+export declare function getListQuery<TTable extends BaseTable, TSelection extends SelectedFields>(args: {
     db: NodePgDatabase<Record<string, unknown>>;
     fields: TSelection;
     jsonArrayFields?: string[];
     /**
      * 行级作用域。**必填**，不想隔离就显式传 NO_SCOPE —— 写成可选的话，漏传就退化成查全表，
-     * 而那是静默的越权（见 scope.ts）。它不走下面 params 那条筛选通道，因为那条的规矩是
-     * 「空值跳过」，一个取不到值的作用域会让整条 where 消失。
+     * 而那是静默的越权（见 scope.ts）。
      */
     scope: ScopeArg;
-    params: {
-        [field: string]: unknown;
-        orderBy?: keyof BaseTable;
-        orderDir?: "asc" | "desc";
-        page?: number;
-        pageSize?: number;
-    };
+    params: ListQueryParams;
     relations?: GetListRelations;
     table: TTable;
 }): {
-    countQuery: Omit<import("drizzle-orm/pg-core").PgSelectBase<string, {
-        count: SQL<unknown>;
-    }, "partial", Record<string, "not-null">, false, "where", {
-        count: unknown;
-    }[], {
-        count: import("drizzle-orm").DrizzleTypeError<"You cannot reference this field without assigning it an alias first - use `.as(<alias>)`">;
-    }>, "where">;
+    countQuery: any;
     query: any;
 };