@tachybase/plugin-full-text-search 0.23.40 → 0.23.41

package/dist/externalVersion.js

@@ -1,8 +1,9 @@
 module.exports = {
-  "@tachybase/client": "0.23.40",
+  "@tachybase/client": "0.23.41",
   "antd": "5.22.5",
   "lodash": "4.17.21",
-  "@tachybase/actions": "0.23.40",
-  "@tachybase/database": "0.23.40",
-  "@tachybase/server": "0.23.40"
+  "@tachybase/server": "0.23.41",
+  "@tachybase/database": "0.23.41",
+  "@tachybase/actions": "0.23.41",
+  "sequelize": "6.37.5"
 };

package/dist/server/dialects/FieldBase.d.ts

@@ -0,0 +1,23 @@
+import { WhereOptions } from 'sequelize';
+import { handleFieldParams } from '../types';
+type NestedRecord<T, K extends string> = K extends `${infer Head}.${infer Tail}` ? {
+    [Key in Head]: NestedRecord<T, Tail>;
+} : {
+    [Key in K]: T;
+};
+export declare class FieldBase {
+    type: string;
+    like: symbol;
+    likeOperator: string;
+    constructor();
+    getFormateDateStr(field: string, fieldInfo: any): string;
+    date(params: handleFieldParams): any;
+    string(params: handleFieldParams): WhereOptions<any> | null;
+    number(params: handleFieldParams): WhereOptions<any>;
+    json(params: handleFieldParams): any;
+    protected convertToObj<T, K extends string>(key: K, value: T): NestedRecord<T, K>;
+    getMultiSelectFilter(field: string, matchEnum: string[]): WhereOptions<any>;
+    array(params: handleFieldParams): WhereOptions<any>;
+    private getMatchEnum;
+}
+export {};

package/dist/server/dialects/FieldBase.js

@@ -0,0 +1,116 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var FieldBase_exports = {};
+__export(FieldBase_exports, {
+  FieldBase: () => FieldBase
+});
+module.exports = __toCommonJS(FieldBase_exports);
+var import_database = require("@tachybase/database");
+var import_sequelize = require("sequelize");
+var import_utils = require("../utils");
+class FieldBase {
+  type = "";
+  like = import_database.Op.like;
+  likeOperator = "LIKE";
+  constructor() {
+  }
+  getFormateDateStr(field, fieldInfo) {
+    return "YYYY-MM-DD HH:mm:ss";
+  }
+  date(params) {
+    return null;
+  }
+  string(params) {
+    var _a, _b;
+    const { field, fields, keyword } = params;
+    const fieldInfo = fields.get(field);
+    if (((_b = (_a = fieldInfo == null ? void 0 : fieldInfo.options) == null ? void 0 : _a.uiSchema) == null ? void 0 : _b["x-component"]) === "Select") {
+      const matchEnum = this.getMatchEnum(fieldInfo, keyword);
+      if (!matchEnum.length) {
+        return null;
+      }
+      return this.convertToObj(field, { [import_database.Op.in]: matchEnum });
+    }
+    return this.convertToObj(field, { [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%` });
+  }
+  number(params) {
+    const { field, keyword } = params;
+    return {
+      [import_database.Op.and]: [
+        (0, import_database.where)(
+          (0, import_database.literal)(`CAST(${(0, import_sequelize.col)(field).col} AS TEXT)`),
+          // 确保不加引号，直接插入 SQL 表达式
+          {
+            [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+          }
+        )
+      ]
+    };
+  }
+  json(params) {
+    return null;
+  }
+  // a.b.c = xxx 转成 { a: { b: { c: 'xxx' } } }
+  convertToObj(key, value) {
+    const MAX_DEPTH = 3;
+    const parts = key.split(".");
+    if (parts.length > MAX_DEPTH) {
+      throw new Error(`Maximum nesting depth of ${MAX_DEPTH} exceeded`);
+    }
+    const newKey = parts.shift();
+    if (!newKey) {
+      throw new Error("Invalid key");
+    }
+    if (!parts.length) {
+      return { [newKey]: value };
+    }
+    return { [newKey]: this.convertToObj(parts.join("."), value) };
+  }
+  // 多选框如何生成filter
+  getMultiSelectFilter(field, matchEnum) {
+    return this.convertToObj(field, { [import_database.Op.contains]: matchEnum });
+  }
+  array(params) {
+    var _a, _b;
+    const { field, keyword, fields } = params;
+    const fieldInfo = fields.get(field);
+    if (((_b = (_a = fieldInfo == null ? void 0 : fieldInfo.options) == null ? void 0 : _a.uiSchema) == null ? void 0 : _b["x-component"]) === "Select") {
+      const matchEnum = this.getMatchEnum(fieldInfo, keyword);
+      if (!matchEnum.length) {
+        return null;
+      }
+      return this.getMultiSelectFilter(field, matchEnum);
+    }
+    return null;
+  }
+  getMatchEnum(fieldInfo, keyword) {
+    const matchEnum = [];
+    const enumList = (fieldInfo == null ? void 0 : fieldInfo.options.uiSchema.enum) || [];
+    const lowerKeyword = keyword.toLowerCase();
+    for (const item of enumList) {
+      if (typeof (item == null ? void 0 : item.label) === "string" && item.label.toLowerCase().includes(lowerKeyword)) {
+        matchEnum.push(item.value);
+      }
+    }
+    return matchEnum;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FieldBase
+});

package/dist/server/dialects/FieldMariadb.d.ts

@@ -0,0 +1,11 @@
+import { WhereOptions } from 'sequelize';
+import { handleFieldParams } from '../types';
+import { FieldBase } from './FieldBase';
+export declare class FieldMariadb extends FieldBase {
+    type: string;
+    getFormateDateStr(field: string, fieldInfo: any): string;
+    number(params: handleFieldParams): WhereOptions<any>;
+    date(params: handleFieldParams): WhereOptions<any>;
+    json(params: handleFieldParams): WhereOptions<any>;
+    getMultiSelectFilter(field: string, matchEnum: string[]): WhereOptions<any>;
+}

package/dist/server/dialects/FieldMariadb.js

@@ -0,0 +1,88 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var FieldMariadb_exports = {};
+__export(FieldMariadb_exports, {
+  FieldMariadb: () => FieldMariadb
+});
+module.exports = __toCommonJS(FieldMariadb_exports);
+var import_database = require("@tachybase/database");
+var import_sequelize = require("sequelize");
+var import_utils = require("../utils");
+var import_FieldBase = require("./FieldBase");
+class FieldMariadb extends import_FieldBase.FieldBase {
+  type = "mariadb";
+  getFormateDateStr(field, fieldInfo) {
+    var _a, _b, _c, _d;
+    let formatStr = "%Y-%m-%d";
+    if ((_d = (_c = (_b = (_a = fieldInfo == null ? void 0 : fieldInfo.get(field)) == null ? void 0 : _a.options) == null ? void 0 : _b.uiSchema) == null ? void 0 : _c["x-component-props"]) == null ? void 0 : _d.dateFormat) {
+      const props = fieldInfo.get(field).options.uiSchema["x-component-props"];
+      formatStr = props.dateFormat.replace("YYYY", "%Y").replace("MM", "%m").replace("DD", "%d");
+      if (props.showTime) {
+        if (props.timeFormat.endsWith(" a")) {
+          formatStr += " %I:%i:%s %p";
+        } else {
+          formatStr += " %H:%i:%s";
+        }
+      }
+    }
+    return formatStr;
+  }
+  number(params) {
+    const { field, keyword } = params;
+    return {
+      [import_database.Op.and]: [
+        (0, import_database.where)(
+          (0, import_database.literal)(`CAST(${(0, import_sequelize.col)(field).col} AS CHAR)`),
+          // 确保不加引号，直接插入 SQL 表达式
+          {
+            [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+          }
+        )
+      ]
+    };
+  }
+  date(params) {
+    const { field, keyword, dateStr, timezone } = params;
+    return {
+      [import_database.Op.and]: [
+        (0, import_database.where)((0, import_database.fn)("DATE_FORMAT", (0, import_database.fn)("CONVERT_TZ", (0, import_sequelize.col)(field), "+00:00", timezone), dateStr), {
+          [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+        })
+      ]
+    };
+  }
+  json(params) {
+    const { field, keyword } = params;
+    return {
+      [import_database.Op.and]: [
+        (0, import_database.where)((0, import_database.literal)(`JSON_UNQUOTE(JSON_EXTRACT(${field}, '$'))`), {
+          [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+        })
+      ]
+    };
+  }
+  getMultiSelectFilter(field, matchEnum) {
+    return {
+      [import_database.Op.and]: [(0, import_database.literal)(`JSON_CONTAINS(${(0, import_sequelize.col)(field).col}, '${JSON.stringify(matchEnum)}')`)]
+    };
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FieldMariadb
+});

package/dist/server/dialects/FieldPostgres.d.ts

@@ -0,0 +1,10 @@
+import { handleFieldParams } from '../types';
+import { FieldBase } from './FieldBase';
+export declare class FieldPostgres extends FieldBase {
+    type: string;
+    like: symbol;
+    likeOperator: string;
+    getFormateDateStr(field: string, fieldInfo: any): string;
+    date(params: handleFieldParams): any;
+    json(params: handleFieldParams): any;
+}

package/dist/server/dialects/FieldPostgres.js

@@ -0,0 +1,79 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var FieldPostgres_exports = {};
+__export(FieldPostgres_exports, {
+  FieldPostgres: () => FieldPostgres
+});
+module.exports = __toCommonJS(FieldPostgres_exports);
+var import_database = require("@tachybase/database");
+var import_sequelize = require("sequelize");
+var import_utils = require("../utils");
+var import_FieldBase = require("./FieldBase");
+class FieldPostgres extends import_FieldBase.FieldBase {
+  type = "postgres";
+  like = import_database.Op.iLike;
+  likeOperator = "ILIKE";
+  getFormateDateStr(field, fieldInfo) {
+    var _a, _b, _c, _d;
+    let formatStr = "YYYY-MM-DD HH:mm:ss";
+    if ((_d = (_c = (_b = (_a = fieldInfo == null ? void 0 : fieldInfo.get(field)) == null ? void 0 : _a.options) == null ? void 0 : _b.uiSchema) == null ? void 0 : _c["x-component-props"]) == null ? void 0 : _d.dateFormat) {
+      const props = fieldInfo.get(field).options.uiSchema["x-component-props"];
+      formatStr = props.dateFormat;
+      if (props.showTime) {
+        formatStr += props.timeFormat.endsWith(" a") ? " HH12:MI:SS" : " HH24:MI:SS";
+      }
+    }
+    return formatStr;
+  }
+  date(params) {
+    const { field, keyword, dateStr, timezone } = params;
+    return {
+      [import_database.Op.and]: [
+        (0, import_database.where)(
+          (0, import_database.fn)(
+            "TO_CHAR",
+            (0, import_database.fn)(
+              "TIMEZONE",
+              timezone,
+              // 参数1：目标时区
+              (0, import_database.fn)("TIMEZONE", "UTC", (0, import_sequelize.col)(field))
+              // 参数2：UTC 转换后的字段
+            ),
+            dateStr
+            // 参数3：格式化字符串
+          ),
+          {
+            [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+          }
+        )
+      ]
+    };
+  }
+  json(params) {
+    const { field, keyword } = params;
+    return this.convertToObj(field, {
+      ["::text"]: {
+        [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+      }
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FieldPostgres
+});

package/dist/server/dialects/FieldSqlite.d.ts

@@ -0,0 +1,15 @@
+import { Op } from '@tachybase/database';
+import { WhereOptions } from 'sequelize';
+import { handleFieldParams } from '../types';
+import { FieldBase } from './FieldBase';
+export declare class FieldSqlite extends FieldBase {
+    type: string;
+    getFormateDateStr(field: string, fieldInfo: any): string;
+    date(params: handleFieldParams): {
+        [Op.and]: any[];
+    };
+    json(params: handleFieldParams): {
+        [Op.and]: any[];
+    };
+    getMultiSelectFilter(field: string, matchEnum: string[]): WhereOptions<any>;
+}

package/dist/server/dialects/FieldSqlite.js

@@ -0,0 +1,83 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var FieldSqlite_exports = {};
+__export(FieldSqlite_exports, {
+  FieldSqlite: () => FieldSqlite
+});
+module.exports = __toCommonJS(FieldSqlite_exports);
+var import_database = require("@tachybase/database");
+var import_sequelize = require("sequelize");
+var import_utils = require("../utils");
+var import_FieldBase = require("./FieldBase");
+class FieldSqlite extends import_FieldBase.FieldBase {
+  type = "sqlite";
+  getFormateDateStr(field, fieldInfo) {
+    var _a, _b, _c, _d;
+    let formatStr = "%Y-%m-%d";
+    if ((_d = (_c = (_b = (_a = fieldInfo == null ? void 0 : fieldInfo.get(field)) == null ? void 0 : _a.options) == null ? void 0 : _b.uiSchema) == null ? void 0 : _c["x-component-props"]) == null ? void 0 : _d.dateFormat) {
+      const props = fieldInfo.get(field).options.uiSchema["x-component-props"];
+      formatStr = props.dateFormat.replace("YYYY", "%Y").replace("MM", "%m").replace("DD", "%d");
+      if (props.showTime) {
+        if (props.timeFormat.endsWith(" a")) {
+          formatStr += " %I:%M:%S %p";
+        } else {
+          formatStr += " %H:%M:%S";
+        }
+      }
+    }
+    return formatStr;
+  }
+  date(params) {
+    const { field, keyword, dateStr, timezone } = params;
+    return {
+      [import_database.Op.and]: [
+        (0, import_database.where)((0, import_database.fn)("strftime", dateStr, (0, import_database.fn)("datetime", (0, import_sequelize.col)(field), (0, import_utils.convertTimezoneOffset)(timezone))), {
+          [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+        })
+      ]
+    };
+  }
+  json(params) {
+    const { field, keyword } = params;
+    return {
+      [import_database.Op.and]: [
+        (0, import_database.where)((0, import_database.literal)(`json_extract(${field}, '$')`), {
+          [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+        })
+      ]
+    };
+  }
+  getMultiSelectFilter(field, matchEnum) {
+    const matchList = matchEnum.map((value) => `'${value}'`).join(",");
+    return {
+      [import_database.Op.and]: [
+        (0, import_database.literal)(`
+        EXISTS (
+          SELECT 1
+          FROM json_each(${(0, import_sequelize.col)(field).col})
+          WHERE json_each.value IN (${matchList})
+        )
+      `)
+      ]
+    };
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FieldSqlite
+});

package/dist/server/middlewares/search.d.ts

@@ -0,0 +1,2 @@
+import { Context } from '@tachybase/actions';
+export declare function searchMiddleware(ctx: Context, next: Function): Promise<any>;

package/dist/server/middlewares/search.js

@@ -0,0 +1,97 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var search_exports = {};
+__export(search_exports, {
+  searchMiddleware: () => searchMiddleware
+});
+module.exports = __toCommonJS(search_exports);
+var import_constants = require("../../constants");
+var import_FieldMariadb = require("../dialects/FieldMariadb");
+var import_FieldPostgres = require("../dialects/FieldPostgres");
+var import_FieldSqlite = require("../dialects/FieldSqlite");
+var import_searchField = require("../searchField");
+function getDialect(dbType) {
+  const handlers = {
+    postgres: () => new import_FieldPostgres.FieldPostgres(),
+    mysql: () => new import_FieldMariadb.FieldMariadb(),
+    // TODO: 考虑mysql5.7的兼容性
+    mariadb: () => new import_FieldMariadb.FieldMariadb(),
+    sqlite: () => new import_FieldSqlite.FieldSqlite()
+  };
+  const handler = handlers[dbType];
+  if (!handler) {
+    throw new Error(`Unsupported database type: ${dbType}`);
+  }
+  return handler();
+}
+async function searchMiddleware(ctx, next) {
+  var _a, _b, _c;
+  const params = ctx.action.params;
+  if ((_a = params.search) == null ? void 0 : _a.keywords) {
+    params.search.keywords = params.search.keywords.map((v) => v.trim()).filter((v) => v);
+  }
+  if (!((_c = (_b = params.search) == null ? void 0 : _b.keywords) == null ? void 0 : _c.length)) {
+    return next();
+  }
+  if (params.search.keywords.length > import_constants.SEARCH_KEYWORDS_MAX) {
+    ctx.throw(400, `keywords max length is ${import_constants.SEARCH_KEYWORDS_MAX}`);
+  }
+  let fields = [];
+  const collection = ctx.db.getCollection(ctx.action.resourceName);
+  if (params.search.fields && !params.search.isSearchAllFields) {
+    fields = params.search.fields;
+  } else {
+    fields = [...collection.fields.keys()];
+  }
+  const dbType = ctx.db.sequelize.getDialect();
+  const handler = getDialect(dbType);
+  const timezone = ctx.get("X-Timezone") || "+00:00";
+  const searchFilterList = [];
+  for (const field of fields) {
+    searchFilterList.push(
+      ...(0, import_searchField.processField)({
+        field,
+        handler,
+        collection,
+        ctx,
+        search: params.search,
+        timezone
+      })
+    );
+  }
+  if (!searchFilterList.length) {
+    return next();
+  }
+  const searchFilter = { $or: searchFilterList };
+  if (params.filter && Object.keys(params.filter).length) {
+    if (Array.isArray(params.filter.$and)) {
+      params.filter.$and.push(searchFilter);
+    } else {
+      params.filter = {
+        $and: [params.filter, searchFilter]
+      };
+    }
+  } else {
+    params.filter = searchFilter;
+  }
+  await next();
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  searchMiddleware
+});

package/dist/server/plugin.js

@@ -21,235 +21,19 @@ __export(plugin_exports, {
   default: () => plugin_default
 });
 module.exports = __toCommonJS(plugin_exports);
-var import_database = require("@tachybase/database");
 var import_server = require("@tachybase/server");
-var import_constants = require("../constants");
-function escapeLike(value) {
-  return value.replace(/[_%]/g, "\\$&");
-}
-const stringFields = ["string", "text", "sequence", "uid", "integer", "float"];
-const numberFields = ["bigInt", "double"];
-const dateFields = ["date", "datetime", "timestamp"];
-const jsonFields = ["json", "jsonb"];
-function getCollectionField(collection, fieldStr, db) {
-  if (!fieldStr.includes(".")) {
-    return {
-      collection,
-      fieldStr
-    };
-  }
-  const parts = fieldStr.split(".");
-  const associationTable = parts.shift();
-  const fields = collection.getFields();
-  const foreignField = fields.find((v) => v.name === associationTable);
-  const nextCollection = db.getCollection(foreignField.target);
-  const nextField = parts.join(".");
-  return getCollectionField(nextCollection, nextField, db);
-}
-function handleJsonQuery(field, dbType, keyword) {
-  if (dbType === "postgres") {
-    return (0, import_database.where)(
-      (0, import_database.literal)(`${field}->>0`),
-      // Assuming the key is '0', adjust for your actual key
-      {
-        [import_database.Op.iLike]: `%${escapeLike(keyword)}%`
-      }
-    );
-  } else if (dbType === "mysql") {
-    return (0, import_database.where)((0, import_database.literal)(`JSON_UNQUOTE(JSON_EXTRACT(${field}, '$'))`), {
-      [import_database.Op.like]: `%${escapeLike(keyword)}%`
-    });
-  } else if (dbType === "sqlite") {
-    return (0, import_database.where)((0, import_database.literal)(`json_extract(${field}, '$')`), {
-      [import_database.Op.like]: `%${escapeLike(keyword)}%`
-    });
-  } else {
-    return field;
-  }
-}
-function convertTimezoneOffset(offset) {
-  const regex = /^([+-])(\d{2}):(\d{2})$/;
-  const match = offset.match(regex);
-  if (match) {
-    const sign = match[1];
-    const hours = parseInt(match[2], 10);
-    return `${sign}${hours} hours`;
-  }
-  return offset;
-}
-function getRealFieldFilter(field, value) {
-  const parts = field.split(".");
-  const key = parts.shift();
-  if (!parts.length) {
-    return { [key]: value };
-  }
-  return { [key]: getRealFieldFilter(parts.join("."), value) };
-}
+var import_search = require("./middlewares/search");
 class PluginFullTextSearchServer extends import_server.Plugin {
   async afterAdd() {
   }
   async beforeLoad() {
   }
   async load() {
-    this.app.resourcer.use(
-      async (ctx, next) => {
-        var _a, _b, _c;
-        if (ctx.action.actionName !== "list") {
-          return next();
-        }
-        const params = ctx.action.params;
-        if ((_a = params.search) == null ? void 0 : _a.keywords) {
-          params.search.keywords = params.search.keywords.map((v) => v.trim()).filter((v) => v);
-        }
-        if (!((_c = (_b = params.search) == null ? void 0 : _b.keywords) == null ? void 0 : _c.length)) {
-          return next();
-        }
-        if (params.search.keywords.length > import_constants.SEARCH_KEYWORDS_MAX) {
-          ctx.throw(500, `keywords max length is ${import_constants.SEARCH_KEYWORDS_MAX}`);
-        }
-        let fields = [];
-        const collection = ctx.db.getCollection(ctx.action.resourceName);
-        const fieldsAll = collection.fields;
-        if (params.search.fields && !params.search.isSearchAllFields) {
-          fields = params.search.fields;
-        } else {
-          fields = [...collection.fields.keys()];
-        }
-        const utcOffset = ctx.get("X-Timezone") || "+00:00";
-        const dbType = ctx.db.sequelize.getDialect();
-        const searchFilter = fields.reduce((acc, field) => {
-          var _a2, _b2, _c2, _d, _e;
-          let type;
-          let fieldName;
-          let fieldInfo;
-          if (!field.includes(".")) {
-            fieldName = dbType === "postgres" ? `"${ctx.action.resourceName}"."${field}"` : `\`${collection.name}\`.\`${field}\``;
-            fieldInfo = fieldsAll;
-            type = (_a2 = fieldInfo.get(field)) == null ? void 0 : _a2.type;
-          } else {
-            const { collection: targetCollection, fieldStr } = getCollectionField(collection, field, ctx.db);
-            fieldInfo = targetCollection.fields;
-            type = (_b2 = fieldInfo.get(fieldStr)) == null ? void 0 : _b2.type;
-            fieldName = dbType === "postgres" ? `"${targetCollection.name}"."${fieldStr}"` : `\`${targetCollection.name}\`.\`${fieldStr}\``;
-            fieldInfo = fieldsAll;
-          }
-          if (stringFields.includes(type)) {
-            for (const keyword of params.search.keywords) {
-              const filterCondition = getRealFieldFilter(field, {
-                [dbType === "postgres" ? import_database.Op.iLike : import_database.Op.like]: `%${escapeLike(keyword)}%`
-              });
-              acc.push(filterCondition);
-            }
-          } else if (numberFields.includes(type)) {
-            if (field.includes(".")) {
-              return acc;
-            }
-            let castFunction = "";
-            if (dbType === "mysql") {
-              castFunction = `CAST(${fieldName} AS CHAR)`;
-            } else {
-              castFunction = `CAST(${fieldName} AS TEXT)`;
-            }
-            const searchList = [];
-            for (const keyword of params.search.keywords) {
-              searchList.push(
-                (0, import_database.where)(
-                  (0, import_database.literal)(castFunction),
-                  // 将 BIGINT 转换为字符串
-                  {
-                    // 根据数据库类型选择 LIKE 或 ILIKE
-                    [dbType === "postgres" ? import_database.Op.iLike : import_database.Op.like]: `%${escapeLike(keyword)}%`
-                  }
-                )
-              );
-            }
-            acc.push({
-              [import_database.Op.or]: searchList
-            });
-          } else if (dateFields.includes(type)) {
-            if (field.includes(".")) {
-              return acc;
-            }
-            let formatStr = "YYYY-MM-DD HH:mm:ss";
-            const info = fieldInfo.get(field);
-            const searchList = [];
-            if ((_e = (_d = (_c2 = info == null ? void 0 : info.options) == null ? void 0 : _c2.uiSchema) == null ? void 0 : _d["x-component-props"]) == null ? void 0 : _e.dateFormat) {
-              const props = info.options.uiSchema["x-component-props"];
-              if (dbType === "postgres") {
-                formatStr = props.dateFormat;
-                if (props.showTime) {
-                  if (props.timeFormat.endsWith(" a")) {
-                    formatStr += " HH12:MI:SS";
-                  } else {
-                    formatStr += " HH24:MI:SS";
-                  }
-                }
-              } else if (dbType === "mysql") {
-                formatStr = props.dateFormat.replace("YYYY", "%Y").replace("MM", "%m").replace("DD", "%d");
-                if (props.showTime) {
-                  if (props.timeFormat.endsWith(" a")) {
-                    formatStr += " %I:%i:%s %p";
-                  } else {
-                    formatStr += " %H:%i:%s";
-                  }
-                }
-              } else if (dbType === "sqlite") {
-                formatStr = props.dateFormat.replace("YYYY", "%Y").replace("MM", "%m").replace("DD", "%d");
-                if (props.showTime) {
-                  if (props.timeFormat.endsWith(" a")) {
-                    formatStr += " %I:%M:%S %p";
-                  } else {
-                    formatStr += " %H:%M:%S";
-                  }
-                }
-              }
-            }
-            for (const keyword of params.search.keywords) {
-              const condition = dbType === "postgres" ? (0, import_database.literal)(`TO_CHAR((${fieldName} AT TIME ZONE 'UTC') AT TIME ZONE '${utcOffset}', '${formatStr}')`) : dbType === "mysql" ? (0, import_database.fn)("DATE_FORMAT", (0, import_database.fn)("CONVERT_TZ", fieldName, "+00:00", utcOffset), formatStr) : dbType === "sqlite" ? (0, import_database.fn)("strftime", formatStr, (0, import_database.fn)("datetime", fieldName, convertTimezoneOffset(utcOffset))) : fieldName;
-              searchList.push(
-                (0, import_database.where)(condition, {
-                  [dbType === "postgres" ? import_database.Op.iLike : import_database.Op.like]: `%${escapeLike(keyword)}%`
-                })
-              );
-            }
-            acc.push({
-              [import_database.Op.or]: searchList
-            });
-          } else if (jsonFields.includes(type)) {
-            if (field.includes(".")) {
-              return acc;
-            }
-            const searchList = [];
-            for (const keyword of params.search.keywords) {
-              searchList.push(handleJsonQuery(fieldName, dbType, keyword));
-            }
-            acc.push({
-              [import_database.Op.or]: searchList
-            });
-          }
-          return acc;
-        }, []);
-        if (searchFilter.length) {
-          if (params.filter && Object.keys(params.filter).length) {
-            if (params.filter.$and) {
-              params.filter.$and.push({ $or: searchFilter });
-            } else {
-              params.filter = {
-                $and: [params.filter, { $or: searchFilter }]
-              };
-            }
-          } else {
-            params.filter = { $or: searchFilter };
-          }
-        }
-        await next();
-      },
-      {
-        tag: "full-text-search",
-        after: "acl",
-        before: "parseVariables"
-      }
-    );
+    this.app.resourcer.use(import_search.searchMiddleware, {
+      tag: "full-text-search",
+      after: "acl",
+      before: "parseVariables"
+    });
   }
   async install() {
   }

package/dist/server/searchField.d.ts

@@ -0,0 +1,7 @@
+import { FieldBase } from './dialects/FieldBase';
+import { ProcessFieldParams } from './types';
+export declare function handleField(handler: FieldBase, func: Function, field: string, fields: Map<string, any>, keywords: string[], extraParams?: {
+    timezone?: string;
+    dateStr?: string;
+}): any[];
+export declare function processField({ field, handler, collection, ctx, search, timezone }: ProcessFieldParams): any[];

package/dist/server/searchField.js

@@ -0,0 +1,113 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var searchField_exports = {};
+__export(searchField_exports, {
+  handleField: () => handleField,
+  processField: () => processField
+});
+module.exports = __toCommonJS(searchField_exports);
+const fieldTypes = {
+  string: ["string", "text", "sequence", "uid", "integer", "float"],
+  number: ["bigInt", "double"],
+  date: ["date", "datetime", "timestamp"],
+  json: ["json", "jsonb"],
+  array: ["array"]
+};
+function isFieldType(type, fieldType) {
+  return fieldTypes[fieldType].includes(type);
+}
+function getCollectionField(collection, fieldStr, db) {
+  if (!fieldStr.includes(".")) {
+    return {
+      collection,
+      fieldStr
+    };
+  }
+  const parts = fieldStr.split(".");
+  const associationTable = parts.shift();
+  const fields = collection.getFields();
+  const foreignField = fields.find((v) => v.name === associationTable);
+  if (!foreignField) {
+    db.logger.error(`Foreign field '${associationTable}' not found in collection '${collection.name}'`);
+  }
+  const newCollection = db.getCollection(foreignField.target);
+  const newField = parts.join(".");
+  return getCollectionField(newCollection, newField, db);
+}
+function handleField(handler, func, field, fields, keywords, extraParams = {}) {
+  const conditions = [];
+  for (const keyword of keywords) {
+    const params = {
+      field,
+      fields,
+      keyword,
+      timezone: extraParams.timezone,
+      dateStr: extraParams.dateStr
+    };
+    const condition = func.call(handler, params);
+    if (condition) {
+      conditions.push(condition);
+    }
+  }
+  return conditions;
+}
+function processField({ field, handler, collection, ctx, search, timezone }) {
+  var _a, _b, _c, _d;
+  let type;
+  let fields;
+  if (!field.includes(".")) {
+    fields = collection.fields;
+    type = (_a = fields.get(field)) == null ? void 0 : _a.type;
+  } else {
+    const { collection: targetCollection, fieldStr } = getCollectionField(collection, field, ctx.db);
+    fields = targetCollection.fields;
+    type = (_b = fields.get(fieldStr)) == null ? void 0 : _b.type;
+  }
+  if ((_d = (_c = fields.get(field)) == null ? void 0 : _c.options) == null ? void 0 : _d.isForeignKey) {
+    return [];
+  }
+  if (isFieldType(type, "string")) {
+    return handleField(handler, handler.string, field, fields, search.keywords);
+  } else if (isFieldType(type, "number")) {
+    if (!field.includes(".")) {
+      return handleField(handler, handler.number, field, fields, search.keywords);
+    }
+  } else if (isFieldType(type, "date")) {
+    if (!field.includes(".")) {
+      const dateStr = handler.getFormateDateStr(field, fields);
+      return handleField(handler, handler.date, field, fields, search.keywords, {
+        timezone,
+        dateStr
+      });
+    }
+  } else if (isFieldType(type, "json")) {
+    if (!field.includes(".")) {
+      return handleField(handler, handler.json, field, fields, search.keywords);
+    }
+  } else if (isFieldType(type, "array")) {
+    if (!field.includes(".")) {
+      return handleField(handler, handler.array, field, fields, search.keywords);
+    }
+  }
+  return [];
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  handleField,
+  processField
+});

package/dist/server/types.d.ts

@@ -0,0 +1,24 @@
+import { Context } from '@tachybase/actions';
+import { Collection } from '@tachybase/database';
+import { FieldBase } from './dialects/FieldBase';
+export type FiledName = string;
+export interface SearchParams {
+    keywords?: string[];
+    fields?: string[];
+    isSearchAllFields?: boolean;
+}
+export interface ProcessFieldParams {
+    ctx: Context;
+    field: string;
+    handler: FieldBase;
+    collection: Collection;
+    search: SearchParams;
+    timezone: string;
+}
+export type handleFieldParams = {
+    field: string;
+    keyword: string;
+    fields: Map<string, any>;
+    timezone?: string;
+    dateStr?: string;
+};

package/dist/server/types.js

@@ -0,0 +1,15 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/server/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function escapeLike(value: string): string;
+export declare function convertTimezoneOffset(utcOffset: string): string;

package/dist/server/utils.js

@@ -0,0 +1,41 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  convertTimezoneOffset: () => convertTimezoneOffset,
+  escapeLike: () => escapeLike
+});
+module.exports = __toCommonJS(utils_exports);
+function escapeLike(value) {
+  return value.replace(/[_%]/g, "\\$&");
+}
+function convertTimezoneOffset(utcOffset) {
+  if (!/^[+-]?\d{2}:\d{2}$/.test(utcOffset)) {
+    throw new Error("Invalid UTC offset format. Expected format: (+/-)HH:MM");
+  }
+  const parts = utcOffset.split(":");
+  const hours = parseInt(parts[0].replace("+", ""), 10);
+  const minutes = parseInt(parts[1], 10);
+  const totalMinutes = hours * 60 + (hours >= 0 ? minutes : -minutes);
+  return `${totalMinutes} minutes`;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  convertTimezoneOffset,
+  escapeLike
+});

package/package.json

@@ -1,18 +1,20 @@
 {
   "name": "@tachybase/plugin-full-text-search",
-  "version": "0.23.40",
+  "version": "0.23.41",
   "description": "Provides full text search capability",
   "main": "dist/server/index.js",
   "devDependencies": {
+    "@types/sequelize": "^4.28.20",
     "antd": "5.22.5",
-    "lodash": "4.17.21"
+    "lodash": "4.17.21",
+    "sequelize": "^6.37.5"
   },
   "peerDependencies": {
-    "@tachybase/actions": "0.23.40",
-    "@tachybase/server": "0.23.40",
-    "@tachybase/test": "0.23.40",
-    "@tachybase/client": "0.23.40",
-    "@tachybase/database": "0.23.40"
+    "@tachybase/actions": "0.23.41",
+    "@tachybase/client": "0.23.41",
+    "@tachybase/database": "0.23.41",
+    "@tachybase/test": "0.23.41",
+    "@tachybase/server": "0.23.41"
   },
   "description.zh-CN": "提供全字段搜索能力",
   "displayName.zh-CN": "全文搜索"