@nocobase/database 2.3.0-beta.6 → 2.3.0-beta.8

package/lib/fields/field.js

@@ -41,7 +41,8 @@ __export(field_exports, {
 });
 module.exports = __toCommonJS(field_exports);
 var import_lodash = __toESM(require("lodash"));
-var import_utils = require("../utils");
+var import_utils = require("@nocobase/utils");
+var import_utils2 = require("../utils");
 const _Field = class _Field {
   options;
   context;
@@ -94,7 +95,7 @@ const _Field = class _Field {
       return this.options.field;
     }
     if (this.database.options.underscored) {
-      return (0, import_utils.snakeCase)(this.name);
+      return (0, import_utils2.snakeCase)(this.name);
     }
     return this.name;
   }
@@ -156,6 +157,23 @@ const _Field = class _Field {
       Object.assign(opts, { type: this.database.sequelize.normalizeDataType(this.dataType) });
     }
     Object.assign(opts, this.additionalSequelizeOptions());
+    if (this.options.interface === "richText") {
+      const { name } = this;
+      const originalSetter = opts.set;
+      const sanitizeValue = /* @__PURE__ */ __name((value) => typeof value === "string" ? (0, import_utils.sanitizeRichTextHtml)(value) : value, "sanitizeValue");
+      opts.set = function(value) {
+        if (typeof originalSetter === "function") {
+          originalSetter.call(this, sanitizeValue(value));
+          const currentValue = this.getDataValue(name);
+          const sanitizedValue = sanitizeValue(currentValue);
+          if (!Object.is(sanitizedValue, currentValue)) {
+            this.setDataValue(name, sanitizedValue);
+          }
+          return;
+        }
+        this.setDataValue(name, sanitizeValue(value));
+      };
+    }
     return opts;
   }
   additionalSequelizeOptions() {

package/lib/model.js

@@ -43,6 +43,7 @@ __export(model_exports, {
 });
 module.exports = __toCommonJS(model_exports);
 var import_lodash = __toESM(require("lodash"));
+var import_utils = require("@nocobase/utils");
 var import_sequelize = require("sequelize");
 var import_sync_runner = require("./sync-runner");
 const _ = import_lodash.default;
@@ -65,6 +66,9 @@ const _Model = class _Model extends import_sequelize.Model {
       } else {
         result[key] = values[key];
       }
+      if ((field == null ? void 0 : field.options.interface) === "richText" && typeof result[key] === "string") {
+        result[key] = (0, import_utils.sanitizeRichTextHtml)(result[key]);
+      }
     }
     return result;
   }

package/lib/operators/string.js

@@ -32,7 +32,11 @@ __export(string_exports, {
 module.exports = __toCommonJS(string_exports);
 var import_sequelize = require("sequelize");
 var import_utils = require("./utils");
-function escapeLike(value) {
+function escapeLike(value, ctx) {
+  if (ctx.db.sequelize.getDialect() === "mssql") {
+    const escapedValue = value.replaceAll("[", "[[]");
+    return escapedValue.replace(/[%_]/g, (character) => `[${character}]`);
+  }
   return value.replace(/[_%]/g, "\\$&");
 }
 __name(escapeLike, "escapeLike");
@@ -85,13 +89,13 @@ var string_default = {
     }
     if (Array.isArray(value)) {
       const conditions = value.map(
-        (item) => getFieldExpression(`%${escapeLike(item)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
+        (item) => getFieldExpression(`%${escapeLike(item, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
       );
       return {
         [import_sequelize.Op.or]: conditions
       };
     }
-    return getFieldExpression(`%${escapeLike(value)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
+    return getFieldExpression(`%${escapeLike(value, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
   },
   $notIncludes(value, ctx) {
     if (value === null) {
@@ -101,56 +105,56 @@ var string_default = {
     }
     if (Array.isArray(value)) {
       const conditions = value.map(
-        (item) => getFieldExpression(`%${escapeLike(item)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
+        (item) => getFieldExpression(`%${escapeLike(item, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
       );
       return {
         [import_sequelize.Op.and]: conditions
       };
     }
-    return getFieldExpression(`%${escapeLike(value)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
+    return getFieldExpression(`%${escapeLike(value, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
   },
   $startsWith(value, ctx) {
     if (Array.isArray(value)) {
       const conditions = value.map(
-        (item) => getFieldExpression(`${escapeLike(item)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
+        (item) => getFieldExpression(`${escapeLike(item, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
       );
       return {
         [import_sequelize.Op.or]: conditions
       };
     }
-    return getFieldExpression(`${escapeLike(value)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
+    return getFieldExpression(`${escapeLike(value, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
   },
   $notStartsWith(value, ctx) {
     if (Array.isArray(value)) {
       const conditions = value.map(
-        (item) => getFieldExpression(`${escapeLike(item)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
+        (item) => getFieldExpression(`${escapeLike(item, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
       );
       return {
         [import_sequelize.Op.and]: conditions
       };
     }
-    return getFieldExpression(`${escapeLike(value)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
+    return getFieldExpression(`${escapeLike(value, ctx)}%`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
   },
   $endWith(value, ctx) {
     if (Array.isArray(value)) {
       const conditions = value.map(
-        (item) => getFieldExpression(`%${escapeLike(item)}`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
+        (item) => getFieldExpression(`%${escapeLike(item, ctx)}`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE")
       );
       return {
         [import_sequelize.Op.or]: conditions
       };
     }
-    return getFieldExpression(`%${escapeLike(value)}`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
+    return getFieldExpression(`%${escapeLike(value, ctx)}`, ctx, (0, import_utils.isPg)(ctx) ? "ILIKE" : "LIKE");
   },
   $notEndWith(value, ctx) {
     if (Array.isArray(value)) {
       const conditions = value.map(
-        (item) => getFieldExpression(`%${escapeLike(item)}`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
+        (item) => getFieldExpression(`%${escapeLike(item, ctx)}`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE")
       );
       return {
         [import_sequelize.Op.and]: conditions
       };
     }
-    return getFieldExpression(`%${escapeLike(value)}`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
+    return getFieldExpression(`%${escapeLike(value, ctx)}`, ctx, (0, import_utils.isPg)(ctx) ? "NOT ILIKE" : "NOT LIKE");
   }
 };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.3.0-beta.6",
+  "version": "2.3.0-beta.8",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "2.3.0-beta.6",
-    "@nocobase/utils": "2.3.0-beta.6",
+    "@nocobase/logger": "2.3.0-beta.8",
+    "@nocobase/utils": "2.3.0-beta.8",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "45b23791f5245d1417047b122d1a76764aaf5473"
+  "gitHead": "5d458884528593b2d3142a6a33de93bf0ad96543"
 }