@ai0x0/utils 0.6.1 → 0.7.0

package/lib/backend/sqlite/actions/create-get-action.js

@@ -32,8 +32,9 @@ function createGetAction({
   table
 }) {
   return async (params, { scope }) => {
+    const exposed = Object.keys(bodySchema.shape);
     const fields = {};
-    for (const key of Object.keys(bodySchema.shape)) {
+    for (const key of exposed) {
       const field = table[key];
       if (field) {
         fields[key] = field;
@@ -42,6 +43,7 @@ function createGetAction({
     const { query, countQuery } = (0, import_get_list_query.getListQuery)({
       db,
       fields,
+      filterable: exposed,
       jsonArrayFields,
       params,
       scope,

package/lib/backend/sqlite/actions/create-get-list-action.js

@@ -33,8 +33,9 @@ function createGetListAction({
 }) {
   return async (params, { scope }) => {
     const { current, pageSize, ...other } = params;
+    const exposed = Object.keys(bodySchema.shape);
     const fields = {};
-    for (const key of Object.keys(bodySchema.shape)) {
+    for (const key of exposed) {
       const field = table[key];
       if (field) {
         fields[key] = field;
@@ -43,6 +44,7 @@ function createGetListAction({
     const { query, countQuery } = (0, import_get_list_query.getListQuery)({
       db,
       fields,
+      filterable: exposed,
       jsonArrayFields,
       params: other,
       scope,

package/lib/backend/sqlite/actions/get-list-data.d.ts

@@ -1,5 +1,5 @@
 import { getListQuery } from "./get-list-query.js";
-export declare function getListData({ query, countQuery, pageSize, current, }: {
+export declare function getListData({ query, countQuery, pageSize: rawPageSize, current: rawCurrent, }: {
     bodySchema?: any;
     current?: number;
     pageSize?: number;

package/lib/backend/sqlite/actions/get-list-data.js

@@ -22,6 +22,7 @@ __export(get_list_data_exports, {
   getListData: () => getListData
 });
 module.exports = __toCommonJS(get_list_data_exports);
+var import_paging = require("../../actions/paging");
 async function runSelect(query) {
   const executable = query;
   if (executable.all) {
@@ -35,11 +36,15 @@ async function runSelect(query) {
 function getListData({
   query,
   countQuery,
-  pageSize = 10,
-  current = 1
+  pageSize: rawPageSize,
+  current: rawCurrent
 }) {
+  const { current, pageSize } = (0, import_paging.normalizePaging)({
+    current: rawCurrent,
+    pageSize: rawPageSize
+  });
   return async () => {
-    const dataQuery = query.limit(+pageSize).offset((+current - 1) * +pageSize);
+    const dataQuery = query.limit(pageSize).offset((current - 1) * pageSize);
     const data = await runSelect(dataQuery);
     const [{ count }] = await runSelect(countQuery);
     return { data, total: Number(count) };

package/lib/backend/sqlite/actions/get-list-query.d.ts

@@ -5,6 +5,8 @@ import { type ListQueryParams } from "../../actions/get-list-query-core.js";
 export declare function getListQuery<TTable extends BaseTable, TSelection extends SelectedFields>(args: {
     db: any;
     fields: TSelection;
+    /** 允许被当成筛选条件的键。不传等于不限制，见核心里的说明。 */
+    filterable?: readonly string[];
     jsonArrayFields?: string[];
     /** 必填。与 pg 那套同义，见 backend/scope.ts。 */
     scope: ScopeArg;

package/lib/backend/sqlite/actions/get-list-query.js

@@ -25,13 +25,13 @@ module.exports = __toCommonJS(get_list_query_exports);
 var import_drizzle_orm = require("drizzle-orm");
 var import_get_list_query_core = require("../../actions/get-list-query-core");
 var run = (0, import_get_list_query_core.createGetListQuery)({
-  contains: (column, keyword) => (0, import_drizzle_orm.like)(column, `%${keyword}%`),
+  contains: (column, pattern) => import_drizzle_orm.sql`${column} LIKE ${pattern} ESCAPE '\\'`,
   // json_each 展开出来的行里，值在 tag.value 上（pg 那个 _text 变体是直接给字符串的）——
   // 这是两边唯一一处连字段名都不同的地方。
-  jsonArrayContains: (column, keyword) => import_drizzle_orm.sql`
+  jsonArrayContains: (column, pattern) => import_drizzle_orm.sql`
     EXISTS (
       SELECT 1 FROM json_each(${column}) tag
-      WHERE tag.value LIKE ${`%${keyword}%`}
+      WHERE tag.value LIKE ${pattern} ESCAPE '\\'
     )
   `
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai0x0/utils",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "AI0x0 utils",
   "keywords": [
     "ai0x0"