@tachybase/plugin-full-text-search 1.3.21 → 1.3.22

package/dist/externalVersion.js

@@ -1,9 +1,7 @@
 module.exports = {
-  "@tachybase/client": "1.3.21",
+  "@tachybase/client": "1.3.22",
   "antd": "5.22.5",
   "lodash": "4.17.21",
-  "@tachybase/server": "1.3.21",
-  "@tachybase/database": "1.3.21",
-  "@tachybase/actions": "1.3.21",
+  "@tego/server": "1.3.39",
   "sequelize": "6.37.5"
 };

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

@@ -1,4 +1,4 @@
-import { Collection } from '@tachybase/database';
+import { Collection } from '@tego/server';
 import { WhereOptions } from 'sequelize';
 import { handleFieldParams } from '../types';
 type NestedRecord<T, K extends string> = K extends `${infer Head}.${infer Tail}` ? {

package/dist/server/dialects/FieldBase.js

@@ -20,13 +20,13 @@ __export(FieldBase_exports, {
   FieldBase: () => FieldBase
 });
 module.exports = __toCommonJS(FieldBase_exports);
-var import_database = require("@tachybase/database");
+var import_server = require("@tego/server");
 var import_sequelize = require("sequelize");
 var import_utils = require("../utils");
 class FieldBase {
   constructor() {
     this.type = "";
-    this.like = import_database.Op.like;
+    this.like = import_server.Op.like;
     this.likeOperator = "LIKE";
   }
   getFormateDateStr(field, fieldInfo) {
@@ -44,7 +44,7 @@ class FieldBase {
       if (!matchEnum.length) {
         return null;
       }
-      return this.convertToObj(field, { [import_database.Op.in]: matchEnum });
+      return this.convertToObj(field, { [import_server.Op.in]: matchEnum });
     }
     return this.convertToObj(field, { [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%` });
   }
@@ -54,12 +54,12 @@ class FieldBase {
       return null;
     }
     return {
-      [import_database.Op.and]: [
-        (0, import_database.where)(
-          (0, import_database.literal)(`CAST(${this.getCollectionFieldColName(field, collection, collectionName)} AS TEXT)`),
+      [import_server.Op.and]: [
+        (0, import_server.where)(
+          (0, import_server.literal)(`CAST(${this.getCollectionFieldColName(field, collection, collectionName)} AS TEXT)`),
           // 确保不加引号，直接插入 SQL 表达式
           {
-            [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+            [import_server.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
           }
         )
       ]
@@ -86,7 +86,7 @@ class FieldBase {
   }
   // 多选框如何生成filter
   getMultiSelectFilter(rawField, matchEnum) {
-    return this.convertToObj(rawField, { [import_database.Op.contains]: matchEnum });
+    return this.convertToObj(rawField, { [import_server.Op.contains]: matchEnum });
   }
   array(params) {
     var _a, _b;

package/dist/server/dialects/FieldMariadb.js

@@ -20,7 +20,7 @@ __export(FieldMariadb_exports, {
   FieldMariadb: () => FieldMariadb
 });
 module.exports = __toCommonJS(FieldMariadb_exports);
-var import_database = require("@tachybase/database");
+var import_server = require("@tego/server");
 var import_utils = require("../utils");
 var import_FieldBase = require("./FieldBase");
 class FieldMariadb extends import_FieldBase.FieldBase {
@@ -47,12 +47,12 @@ class FieldMariadb extends import_FieldBase.FieldBase {
   number(params) {
     const { field, keyword, collectionName, collection } = params;
     return {
-      [import_database.Op.and]: [
-        (0, import_database.where)(
-          (0, import_database.literal)(`CAST(${this.getCollectionFieldColName(field, collection, collectionName)} AS CHAR)`),
+      [import_server.Op.and]: [
+        (0, import_server.where)(
+          (0, import_server.literal)(`CAST(${this.getCollectionFieldColName(field, collection, collectionName)} AS CHAR)`),
           // 确保不加引号，直接插入 SQL 表达式
           {
-            [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+            [import_server.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
           }
         )
       ]
@@ -61,11 +61,11 @@ class FieldMariadb extends import_FieldBase.FieldBase {
   date(params) {
     const { field, keyword, dateStr, timezone, collectionName, collection } = params;
     return {
-      [import_database.Op.and]: [
-        (0, import_database.where)(
-          (0, import_database.fn)(
+      [import_server.Op.and]: [
+        (0, import_server.where)(
+          (0, import_server.fn)(
             "DATE_FORMAT",
-            (0, import_database.fn)("CONVERT_TZ", this.getCollectionField(field, collection, collectionName), "+00:00", timezone),
+            (0, import_server.fn)("CONVERT_TZ", this.getCollectionField(field, collection, collectionName), "+00:00", timezone),
             dateStr
           ),
           {
@@ -78,13 +78,13 @@ class FieldMariadb extends import_FieldBase.FieldBase {
   json(params) {
     const { field, keyword, collection, collectionName } = params;
     return {
-      [import_database.Op.and]: [
-        (0, import_database.where)(
-          (0, import_database.literal)(
+      [import_server.Op.and]: [
+        (0, import_server.where)(
+          (0, import_server.literal)(
             `JSON_UNQUOTE(JSON_EXTRACT(${this.getCollectionFieldColName(field, collection, collectionName)}, '$'))`
           ),
           {
-            [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+            [import_server.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
           }
         )
       ]
@@ -92,7 +92,7 @@ class FieldMariadb extends import_FieldBase.FieldBase {
   }
   getMultiSelectFilter(rawField, matchEnum) {
     return {
-      [import_database.Op.and]: [(0, import_database.literal)(`JSON_CONTAINS(${rawField}, '${JSON.stringify(matchEnum)}')`)]
+      [import_server.Op.and]: [(0, import_server.literal)(`JSON_CONTAINS(${rawField}, '${JSON.stringify(matchEnum)}')`)]
     };
   }
 }

package/dist/server/dialects/FieldPostgres.js

@@ -20,7 +20,7 @@ __export(FieldPostgres_exports, {
   FieldPostgres: () => FieldPostgres
 });
 module.exports = __toCommonJS(FieldPostgres_exports);
-var import_database = require("@tachybase/database");
+var import_server = require("@tego/server");
 var import_sequelize = require("sequelize");
 var import_utils = require("../utils");
 var import_FieldBase = require("./FieldBase");
@@ -28,7 +28,7 @@ class FieldPostgres extends import_FieldBase.FieldBase {
   constructor() {
     super(...arguments);
     this.type = "postgres";
-    this.like = import_database.Op.iLike;
+    this.like = import_server.Op.iLike;
     this.likeOperator = "ILIKE";
   }
   getFormateDateStr(field, fieldInfo) {
@@ -46,22 +46,22 @@ class FieldPostgres extends import_FieldBase.FieldBase {
   date(params) {
     const { field, keyword, dateStr, timezone, collectionName, collection } = params;
     return {
-      [import_database.Op.and]: [
-        (0, import_database.where)(
-          (0, import_database.fn)(
+      [import_server.Op.and]: [
+        (0, import_server.where)(
+          (0, import_server.fn)(
             "TO_CHAR",
-            (0, import_database.fn)(
+            (0, import_server.fn)(
               "TIMEZONE",
               timezone,
               // 参数1：目标时区
-              (0, import_database.fn)("TIMEZONE", "UTC", this.getCollectionField(field, collection, collectionName))
+              (0, import_server.fn)("TIMEZONE", "UTC", this.getCollectionField(field, collection, collectionName))
               // 参数2：UTC 转换后的字段
             ),
             dateStr
             // 参数3：格式化字符串
           ),
           {
-            [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+            [import_server.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
           }
         )
       ]
@@ -81,12 +81,12 @@ class FieldPostgres extends import_FieldBase.FieldBase {
       return null;
     }
     return {
-      [import_database.Op.and]: [
-        (0, import_database.where)(
+      [import_server.Op.and]: [
+        (0, import_server.where)(
           (0, import_sequelize.literal)(`CAST(${this.getCollectionFieldColName(field, collection, collectionName)} AS TEXT)`),
           // 确保不加引号，直接插入 SQL 表达式
           {
-            [import_database.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
+            [import_server.Op.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
           }
         )
       ]

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

@@ -1,4 +1,4 @@
-import { Op } from '@tachybase/database';
+import { Op } from '@tego/server';
 import { WhereOptions } from 'sequelize';
 import { handleFieldParams } from '../types';
 import { FieldBase } from './FieldBase';

package/dist/server/dialects/FieldSqlite.js

@@ -20,7 +20,7 @@ __export(FieldSqlite_exports, {
   FieldSqlite: () => FieldSqlite
 });
 module.exports = __toCommonJS(FieldSqlite_exports);
-var import_database = require("@tachybase/database");
+var import_server = require("@tego/server");
 var import_utils = require("../utils");
 var import_FieldBase = require("./FieldBase");
 class FieldSqlite extends import_FieldBase.FieldBase {
@@ -47,12 +47,12 @@ class FieldSqlite extends import_FieldBase.FieldBase {
   date(params) {
     const { field, keyword, dateStr, timezone, collectionName, collection } = params;
     return {
-      [import_database.Op.and]: [
-        (0, import_database.where)(
-          (0, import_database.fn)(
+      [import_server.Op.and]: [
+        (0, import_server.where)(
+          (0, import_server.fn)(
             "strftime",
             dateStr,
-            (0, import_database.fn)("datetime", this.getCollectionField(field, collection, collectionName), (0, import_utils.convertTimezoneOffset)(timezone))
+            (0, import_server.fn)("datetime", this.getCollectionField(field, collection, collectionName), (0, import_utils.convertTimezoneOffset)(timezone))
           ),
           {
             [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
@@ -64,8 +64,8 @@ class FieldSqlite extends import_FieldBase.FieldBase {
   json(params) {
     const { field, keyword, collectionName, collection } = params;
     return {
-      [import_database.Op.and]: [
-        (0, import_database.where)((0, import_database.literal)(`json_extract(${this.getCollectionFieldColName(field, collection, collectionName)}, '$')`), {
+      [import_server.Op.and]: [
+        (0, import_server.where)((0, import_server.literal)(`json_extract(${this.getCollectionFieldColName(field, collection, collectionName)}, '$')`), {
           [this.like]: `%${(0, import_utils.escapeLike)(keyword)}%`
         })
       ]
@@ -74,8 +74,8 @@ class FieldSqlite extends import_FieldBase.FieldBase {
   getMultiSelectFilter(rawField, matchEnum) {
     const matchList = matchEnum.map((value) => `'${value}'`).join(",");
     return {
-      [import_database.Op.and]: [
-        (0, import_database.literal)(`
+      [import_server.Op.and]: [
+        (0, import_server.literal)(`
         EXISTS (
           SELECT 1
           FROM json_each(${rawField})

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

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

package/dist/server/plugin.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from '@tachybase/server';
+import { Plugin } from '@tego/server';
 export declare class PluginFullTextSearchServer extends Plugin {
     afterAdd(): Promise<void>;
     beforeLoad(): Promise<void>;

package/dist/server/plugin.js

@@ -21,7 +21,7 @@ __export(plugin_exports, {
   default: () => plugin_default
 });
 module.exports = __toCommonJS(plugin_exports);
-var import_server = require("@tachybase/server");
+var import_server = require("@tego/server");
 var import_search = require("./middlewares/search");
 class PluginFullTextSearchServer extends import_server.Plugin {
   async afterAdd() {

package/dist/server/searchField.d.ts

@@ -1,4 +1,4 @@
-import { Collection } from '@tachybase/database';
+import { Collection } from '@tego/server';
 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?: {

package/dist/server/types.d.ts

@@ -1,5 +1,4 @@
-import { Context } from '@tachybase/actions';
-import { Collection } from '@tachybase/database';
+import { Collection, Context } from '@tego/server';
 import { FieldBase } from './dialects/FieldBase';
 export type FiledName = string;
 export interface SearchParams {

package/package.json

@@ -1,24 +1,21 @@
 {
   "name": "@tachybase/plugin-full-text-search",
   "displayName": "Full-text Search",
-  "version": "1.3.21",
+  "version": "1.3.22",
   "description": "Provides full text search capability",
   "keywords": [
     "System management"
   ],
   "main": "dist/server/index.js",
   "devDependencies": {
+    "@tachybase/test": "^1.3.39",
+    "@tego/client": "^1.3.39",
+    "@tego/server": "^1.3.39",
     "@types/sequelize": "^4.28.20",
     "antd": "5.22.5",
     "lodash": "4.17.21",
-    "sequelize": "^6.37.5"
-  },
-  "peerDependencies": {
-    "@tachybase/actions": "1.3.21",
-    "@tachybase/database": "1.3.21",
-    "@tachybase/server": "1.3.21",
-    "@tachybase/test": "1.3.21",
-    "@tachybase/client": "1.3.21"
+    "sequelize": "^6.37.5",
+    "@tachybase/client": "1.3.22"
   },
   "description.zh-CN": "提供全字段搜索能力",
   "displayName.zh-CN": "全文搜索"