@nocobase/database 1.9.0-beta.1 → 1.9.0-beta.11

package/lib/collection.d.ts

@@ -88,6 +88,13 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     get db(): Database;
     get treeParentField(): BelongsToField | null;
     get treeChildrenField(): HasManyField | null;
+    validate(options: {
+        values: Record<string, any> | Record<string, any>[];
+        operation: 'create' | 'update';
+        context: {
+            t: Function;
+        };
+    }): void;
     isMultiFilterTargetKey(): boolean;
     tableName(): any;
     /**

package/lib/collection.js

@@ -53,9 +53,11 @@ var import_events = require("events");
 var import_lodash = __toESM(require("lodash"));
 var import_safe_json_stringify = __toESM(require("safe-json-stringify"));
 var import_sequelize = require("sequelize");
+var import_fields = require("./fields");
 var import_model = require("./model");
 var import_repository = require("./repository");
 var import_utils = require("./utils");
+var import_field_validation = require("./utils/field-validation");
 function EnsureAtomicity(target, propertyKey, descriptor) {
   const originalMethod = descriptor.value;
   descriptor.value = function(...args) {
@@ -152,6 +154,71 @@ const _Collection = class _Collection extends import_events.EventEmitter {
       }
     }
   }
+  validate(options) {
+    const { values: updateValues, context, operation } = options;
+    if (!updateValues) {
+      return;
+    }
+    const values = Array.isArray(updateValues) ? updateValues : [updateValues];
+    const { t } = context || { t: /* @__PURE__ */ __name((key, options2) => key, "t") };
+    const unwrapTplLabel = /* @__PURE__ */ __name((label) => {
+      if (typeof label !== "string") return label;
+      const m = label.match(/^[\s\t]*\{\{\s*t\(\s*(['"])(.*?)\1(?:\s*,[\s\S]*)?\)\s*\}\}[\s\t]*$/);
+      return m ? m[2] : label;
+    }, "unwrapTplLabel");
+    const helper = /* @__PURE__ */ __name((field, value) => {
+      var _a, _b, _c;
+      const val = value[field.name];
+      if (!field.options.validation) {
+        return;
+      }
+      const fieldLabel = unwrapTplLabel(((_a = field.options.uiSchema) == null ? void 0 : _a.title) || field.name);
+      if (field instanceof import_fields.RelationField) {
+        if ((_b = field.options) == null ? void 0 : _b.validation.rules) {
+          const isRequired = (_c = field.options) == null ? void 0 : _c.validation.rules.some((rule) => rule.name === "required");
+          if (isRequired && !val) {
+            throw new Error(
+              t("{{#label}} is required", {
+                ns: "client",
+                "#label": `${t("Collection", { ns: "client" })}: ${this.name}, ${t("Field", { ns: "client" })}: ${t(
+                  fieldLabel,
+                  { ns: "client" }
+                )}`
+              })
+            );
+          }
+        }
+        return;
+      }
+      const joiSchema = (0, import_field_validation.buildJoiSchema)(field.options.validation, {
+        label: `${t("Collection", { ns: "client" })}: ${this.name}, ${t("Field", { ns: "client" })}: ${t(fieldLabel, {
+          ns: "client"
+        })}`,
+        value: val
+      });
+      const { error } = joiSchema.validate(val, {
+        messages: (0, import_field_validation.getJoiErrorMessage)(t)
+      });
+      if (error) {
+        throw error;
+      }
+    }, "helper");
+    for (const value of values) {
+      if (operation === "create") {
+        for (const [, field] of this.fields) {
+          helper(field, value);
+        }
+      }
+      if (operation === "update") {
+        for (const key of Object.keys(value)) {
+          const field = this.getField(key);
+          if (field) {
+            helper(field, value);
+          }
+        }
+      }
+    }
+  }
   isMultiFilterTargetKey() {
     return Array.isArray(this.filterTargetKey) && this.filterTargetKey.length > 1;
   }

package/lib/cursor-builder.js

@@ -87,7 +87,7 @@ const _SmartCursorBuilder = class _SmartCursorBuilder {
         AND a.attnum = ANY(ix.indkey)
         AND t.relkind = 'r'
         AND n.nspname = current_schema()
-        AND t.relname = $1
+        AND t.relname = ?
       ORDER BY 
         i.relname, 
         array_position(ix.indkey, a.attnum)
@@ -145,8 +145,9 @@ const _SmartCursorBuilder = class _SmartCursorBuilder {
           isUnique: indexType < 3
         });
       }
-      const index = indexes.get(row.INDEX_NAME);
-      index.columns[row.SEQ_IN_INDEX - 1] = row.COLUMN_NAME;
+      const seqInIndex = dialect === "postgres" ? row.seq_in_index : row.SEQ_IN_INDEX;
+      const index = indexes.get(indexName);
+      index.columns[seqInIndex - 1] = columnName;
     }
     for (const index of indexes.values()) {
       if (index.isPrimary) {

package/lib/database.d.ts

@@ -118,7 +118,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     /**
      * @internal
      */
-    sequelizeOptions(options: any): IDatabaseOptions;
+    sequelizeOptions(options: DatabaseOptions): IDatabaseOptions;
     /**
      * @internal
      */
@@ -128,6 +128,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     inDialect(...dialect: string[]): boolean;
     isMySQLCompatibleDialect(): boolean;
     isPostgresCompatibleDialect(): boolean;
+    wrapSequelizeRunForMySQL(): void;
     /**
      * Add collection to database
      * @param options

package/lib/database.js

@@ -176,6 +176,9 @@ const _Database = class _Database extends import_events.EventEmitter {
     );
     const sequelizeOptions = this.sequelizeOptions(this.options);
     this.sequelize = new import_sequelize.Sequelize(sequelizeOptions);
+    if (options.dialect === "mysql") {
+      this.wrapSequelizeRunForMySQL();
+    }
     this.queryInterface = (0, import_query_interface_builder.default)(this);
     this.collections = /* @__PURE__ */ new Map();
     this.modelHook = new import_model_hook.ModelHook(this);
@@ -397,6 +400,30 @@ const _Database = class _Database extends import_events.EventEmitter {
   isPostgresCompatibleDialect() {
     return this.inDialect("postgres");
   }
+  /*
+   * https://github.com/sidorares/node-mysql2/issues/1239#issuecomment-766867699
+   * https://github.com/sidorares/node-mysql2/pull/1407#issuecomment-1325789581
+   * > I'm starting to think simple "always send (parameter.toString()) as VAR_STRING" unless the type is explicitly specified by user" might be actually the best behaviour
+   */
+  wrapSequelizeRunForMySQL() {
+    const that = this;
+    const run = this.sequelize.dialect.Query.prototype.run;
+    this.sequelize.dialect.Query.prototype.run = function(sql, parameters) {
+      if (!/^update\s+/i.test(sql.trim()) || !(parameters == null ? void 0 : parameters.length)) {
+        return run.apply(this, [sql, parameters]);
+      }
+      try {
+        parameters.forEach((p, index) => {
+          if (typeof p === "number") {
+            parameters[index] = p.toString();
+          }
+        });
+      } catch (err) {
+        that.logger.error(err);
+      }
+      return run.apply(this, [sql, parameters]);
+    };
+  }
   /**
    * Add collection to database
    * @param options
@@ -611,8 +638,8 @@ const _Database = class _Database extends import_events.EventEmitter {
   }
   /* istanbul ignore next -- @preserve */
   async auth(options = {}) {
-    const { retry = 9, ...others } = options;
-    const startingDelay = 50;
+    const { retry = 10, ...others } = options;
+    const startingDelay = 1e3;
     const timeMultiple = 2;
     let attemptNumber = 1;
     const authenticate = /* @__PURE__ */ __name(async () => {
@@ -635,7 +662,8 @@ const _Database = class _Database extends import_events.EventEmitter {
       await (0, import_exponential_backoff.backOff)(authenticate, {
         numOfAttempts: retry,
         startingDelay,
-        timeMultiple
+        timeMultiple,
+        maxDelay: 30 * 1e3
       });
     } catch (error) {
       throw new Error(`Unable to connect to the database`, { cause: error });

package/lib/dialects/mysql-dialect.d.ts

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { BaseDialect } from './base-dialect';
+import { DatabaseOptions } from '../database';
 export declare class MysqlDialect extends BaseDialect {
     static dialectName: string;
     getVersionGuard(): {
@@ -14,5 +15,5 @@ export declare class MysqlDialect extends BaseDialect {
         get: (v: string) => string;
         version: string;
     };
-    getSequelizeOptions(options: any): any;
+    getSequelizeOptions(options: DatabaseOptions): import("../database").IDatabaseOptions;
 }

package/lib/dialects/mysql-dialect.js

@@ -32,7 +32,6 @@ __export(mysql_dialect_exports, {
   MysqlDialect: () => MysqlDialect
 });
 module.exports = __toCommonJS(mysql_dialect_exports);
-var import_utils = require("@nocobase/utils");
 var import_base_dialect = require("./base-dialect");
 const _MysqlDialect = class _MysqlDialect extends import_base_dialect.BaseDialect {
   getVersionGuard() {
@@ -46,7 +45,11 @@ const _MysqlDialect = class _MysqlDialect extends import_base_dialect.BaseDialec
     };
   }
   getSequelizeOptions(options) {
-    import_utils.lodash.set(options, "dialectOptions.multipleStatements", true);
+    const dialectOptions = {
+      ...options.dialectOptions || {},
+      multipleStatements: true
+    };
+    options.dialectOptions = dialectOptions;
     return options;
   }
 };

package/lib/eager-loading/eager-loading-tree.js

@@ -44,6 +44,7 @@ var import_lodash = __toESM(require("lodash"));
 var import_sequelize = require("sequelize");
 var import_append_child_collection_name_after_repository_find = require("../listeners/append-child-collection-name-after-repository-find");
 var import_options_parser = require("../options-parser");
+var import_utils = require("../utils");
 const pushAttribute = /* @__PURE__ */ __name((node, attribute) => {
   if (import_lodash.default.isArray(node.attributes) && !node.attributes.includes(attribute)) {
     node.attributes.push(attribute);
@@ -85,25 +86,6 @@ const queryParentSQL = /* @__PURE__ */ __name((options) => {
       )
       SELECT ${q(targetKeyField)} AS ${q(targetKey)}, ${q(foreignKeyField)} AS ${q(foreignKey)} FROM cte`;
 }, "queryParentSQL");
-const processIncludes = /* @__PURE__ */ __name((includes, model, parentAs = "") => {
-  includes.forEach((include, index) => {
-    const association = model.associations[include.association];
-    if (association == null ? void 0 : association.generateInclude) {
-      includes[index] = {
-        ...include,
-        ...association.generateInclude(parentAs)
-      };
-    }
-    if (include.include && Array.isArray(include.include) && include.include.length > 0) {
-      const nextModel = association == null ? void 0 : association.target;
-      if (!nextModel) {
-        return;
-      }
-      processIncludes(include.include, nextModel, parentAs ? `${parentAs}->${association.as}` : association.as);
-    }
-  });
-  return includes;
-}, "processIncludes");
 const _EagerLoadingTree = class _EagerLoadingTree {
   root;
   db;
@@ -233,7 +215,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
             attributes: [primaryKeyField],
             group: `${node.model.name}.${primaryKeyField}`,
             transaction,
-            include: processIncludes(includeForFilter, node.model)
+            include: (0, import_utils.processIncludes)(includeForFilter, node.model)
           })).map((row) => {
             return { row, pk: row[primaryKeyField] };
           });

package/lib/fields/field.d.ts

@@ -10,17 +10,39 @@ import { DataType, ModelAttributeColumnOptions, ModelIndexesOptions, SyncOptions
 import { Collection } from '../collection';
 import { Database } from '../database';
 import { ModelEventTypes } from '../types';
+import { BasicType, BooleanSchema, NumberSchema, ObjectSchema, StringSchema } from 'joi';
 export interface FieldContext {
     database: Database;
     collection: Collection;
 }
-export interface BaseFieldOptions {
+type RuleSchemaMap = {
+    string: StringSchema;
+    boolean: BooleanSchema;
+    number: NumberSchema;
+    object: ObjectSchema;
+};
+export type FieldValidationRuleName<T extends BasicType> = T extends keyof RuleSchemaMap ? keyof RuleSchemaMap[T] : never;
+export interface FieldValidationRule<T extends BasicType> {
+    key: string;
+    name: FieldValidationRuleName<T>;
+    args?: {
+        [key: string]: any;
+    };
+    paramsType?: 'object';
+}
+export interface ValidationOptions<T extends BasicType = BasicType> {
+    type: T;
+    rules: FieldValidationRule<T>[];
+    [key: string]: any;
+}
+export interface BaseFieldOptions<T extends BasicType = BasicType> {
     name?: string;
     hidden?: boolean;
     translation?: boolean;
+    validation?: ValidationOptions<T>;
     [key: string]: any;
 }
-export interface BaseColumnFieldOptions extends BaseFieldOptions, Omit<ModelAttributeColumnOptions, 'type'> {
+export interface BaseColumnFieldOptions<T extends BasicType = BasicType> extends BaseFieldOptions<T>, Omit<ModelAttributeColumnOptions, 'type'> {
     dataType?: DataType;
     index?: boolean | ModelIndexesOptions;
 }
@@ -50,3 +72,4 @@ export declare abstract class Field {
     additionalSequelizeOptions(): {};
     typeToString(): any;
 }
+export {};

package/lib/fields/index.d.ts

@@ -32,6 +32,7 @@ import { UnixTimestampFieldOptions } from './unix-timestamp-field';
 import { DateOnlyFieldOptions } from './date-only-field';
 import { DatetimeNoTzFieldOptions } from './datetime-no-tz-field';
 import { DatetimeTzFieldOptions } from './datetime-tz-field';
+import { SnowflakeIdFieldOptions } from './snowflake-id-field';
 export * from './array-field';
 export * from './belongs-to-field';
 export * from './belongs-to-many-field';
@@ -60,4 +61,5 @@ export * from './virtual-field';
 export * from './nanoid-field';
 export * from './encryption-field';
 export * from './unix-timestamp-field';
-export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | DatetimeTzFieldOptions | DatetimeNoTzFieldOptions | DateOnlyFieldOptions | UnixTimestampFieldOptions | UidFieldOptions | UUIDFieldOptions | NanoidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions | EncryptionField;
+export * from './snowflake-id-field';
+export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | DatetimeTzFieldOptions | DatetimeNoTzFieldOptions | DateOnlyFieldOptions | UnixTimestampFieldOptions | UidFieldOptions | UUIDFieldOptions | NanoidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions | EncryptionField | SnowflakeIdFieldOptions;

package/lib/fields/index.js

@@ -51,6 +51,7 @@ __reExport(fields_exports, require("./virtual-field"), module.exports);
 __reExport(fields_exports, require("./nanoid-field"), module.exports);
 __reExport(fields_exports, require("./encryption-field"), module.exports);
 __reExport(fields_exports, require("./unix-timestamp-field"), module.exports);
+__reExport(fields_exports, require("./snowflake-id-field"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./array-field"),
@@ -80,5 +81,6 @@ __reExport(fields_exports, require("./unix-timestamp-field"), module.exports);
   ...require("./virtual-field"),
   ...require("./nanoid-field"),
   ...require("./encryption-field"),
-  ...require("./unix-timestamp-field")
+  ...require("./unix-timestamp-field"),
+  ...require("./snowflake-id-field")
 });

package/lib/fields/number-field.d.ts

@@ -13,7 +13,7 @@ export declare abstract class NumberField extends Field {
 export declare class IntegerField extends NumberField {
     get dataType(): DataTypes.IntegerDataTypeConstructor;
 }
-export interface IntegerFieldOptions extends BaseColumnFieldOptions {
+export interface IntegerFieldOptions extends BaseColumnFieldOptions<'number'> {
     type: 'integer';
 }
 export declare class BigIntField extends NumberField {

package/lib/fields/snowflake-id-field.d.ts

@@ -0,0 +1,29 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { DataTypes } from 'sequelize';
+import { BaseColumnFieldOptions, Field } from './field';
+interface Application {
+    snowflakeIdGenerator: {
+        generate(): number | BigInt;
+    };
+}
+export declare class SnowflakeIdField extends Field {
+    private static app;
+    static setApp(app: Application): void;
+    get dataType(): DataTypes.BigIntDataTypeConstructor;
+    private setId;
+    init(): void;
+    bind(): void;
+    unbind(): void;
+}
+export interface SnowflakeIdFieldOptions extends BaseColumnFieldOptions {
+    type: 'snowflakeId';
+    epoch?: number;
+}
+export {};

package/lib/fields/snowflake-id-field.js

@@ -0,0 +1,79 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+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 __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+var snowflake_id_field_exports = {};
+__export(snowflake_id_field_exports, {
+  SnowflakeIdField: () => SnowflakeIdField
+});
+module.exports = __toCommonJS(snowflake_id_field_exports);
+var import_sequelize = require("sequelize");
+var import_field = require("./field");
+const _SnowflakeIdField = class _SnowflakeIdField extends import_field.Field {
+  static setApp(app) {
+    this.app = app;
+  }
+  get dataType() {
+    return import_sequelize.DataTypes.BIGINT;
+  }
+  setId(name, instance) {
+    const value = instance.get(name);
+    if (!value) {
+      const generator = this.constructor.app.snowflakeIdGenerator;
+      instance.set(name, generator.generate());
+    }
+  }
+  init() {
+    const { name } = this.options;
+    this.listener = (instance) => this.setId(name, instance);
+    this.bulkListener = async (instances) => {
+      for (const instance of instances) {
+        this.setId(name, instance);
+      }
+    };
+  }
+  bind() {
+    super.bind();
+    this.on("beforeValidate", this.listener);
+    this.on("beforeSave", this.listener);
+    this.on("beforeBulkCreate", this.bulkListener);
+  }
+  unbind() {
+    super.unbind();
+    this.off("beforeValidate", this.listener);
+    this.off("beforeSave", this.listener);
+    this.off("beforeBulkCreate", this.bulkListener);
+  }
+};
+__name(_SnowflakeIdField, "SnowflakeIdField");
+__publicField(_SnowflakeIdField, "app");
+let SnowflakeIdField = _SnowflakeIdField;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SnowflakeIdField
+});

package/lib/fields/string-field.d.ts

@@ -14,7 +14,7 @@ export declare class StringField extends Field {
         set(value: any): void;
     };
 }
-export interface StringFieldOptions extends BaseColumnFieldOptions {
+export interface StringFieldOptions extends BaseColumnFieldOptions<'string'> {
     type: 'string';
     length?: number;
     trim?: boolean;

package/lib/index.d.ts

@@ -41,3 +41,5 @@ export * from './view-collection';
 export { default as fieldTypeMap } from './view/field-type-map';
 export * from './view/view-inference';
 export * from './update-guard';
+export { default as operators } from './operators';
+export { filterIncludes, mergeIncludes } from './utils/filter-include';

package/lib/index.js

@@ -54,8 +54,11 @@ __export(src_exports, {
   ValidationErrorItem: () => import_sequelize.ValidationErrorItem,
   default: () => import_database.Database,
   fieldTypeMap: () => import_field_type_map.default,
+  filterIncludes: () => import_filter_include.filterIncludes,
   fn: () => import_sequelize.fn,
   literal: () => import_sequelize.literal,
+  mergeIncludes: () => import_filter_include.mergeIncludes,
+  operators: () => import_operators.default,
   snakeCase: () => import_utils.snakeCase,
   sqlParser: () => import_sql_parser.default,
   where: () => import_sequelize.where
@@ -96,6 +99,8 @@ __reExport(src_exports, require("./view-collection"), module.exports);
 var import_field_type_map = __toESM(require("./view/field-type-map"));
 __reExport(src_exports, require("./view/view-inference"), module.exports);
 __reExport(src_exports, require("./update-guard"), module.exports);
+var import_operators = __toESM(require("./operators"));
+var import_filter_include = require("./utils/filter-include");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseError,
@@ -114,8 +119,11 @@ __reExport(src_exports, require("./update-guard"), module.exports);
   ValidationError,
   ValidationErrorItem,
   fieldTypeMap,
+  filterIncludes,
   fn,
   literal,
+  mergeIncludes,
+  operators,
   snakeCase,
   sqlParser,
   where,

package/lib/inherited-sync-runner.js

@@ -77,6 +77,11 @@ const _InheritedSyncRunner = class _InheritedSyncRunner {
       let maxSequenceName;
       if (childAttributes.id && childAttributes.id.autoIncrement) {
         for (const parent of parents) {
+          const attributes2 = parent.model.getAttributes();
+          const parentIdField = attributes2["id"];
+          if (!(parentIdField == null ? void 0 : parentIdField.autoIncrement)) {
+            continue;
+          }
           const sequenceNameResult = await queryInterface.sequelize.query(
             `SELECT column_default
              FROM information_schema.columns

package/lib/interfaces/number-interface.d.ts

@@ -12,4 +12,5 @@ export declare class NumberInterface extends BaseInterface {
     toValue(value: any): Promise<any>;
     parseValue(value: any): any;
     validate(value: any): boolean;
+    toString(value: number, ctx?: any): string | number;
 }

package/lib/interfaces/number-interface.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -24,12 +26,21 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var number_interface_exports = {};
 __export(number_interface_exports, {
   NumberInterface: () => NumberInterface
 });
 module.exports = __toCommonJS(number_interface_exports);
+var import_lodash = __toESM(require("lodash"));
 var import_base_interface = require("./base-interface");
 const _NumberInterface = class _NumberInterface extends import_base_interface.BaseInterface {
   sanitizeValue(value) {
@@ -63,6 +74,23 @@ const _NumberInterface = class _NumberInterface extends import_base_interface.Ba
   validate(value) {
     return !isNaN(value);
   }
+  toString(value, ctx) {
+    var _a, _b, _c, _d;
+    value = super.toString(value, ctx);
+    const step = (_c = (_b = (_a = this.options) == null ? void 0 : _a.uiSchema) == null ? void 0 : _b["x-component-props"]) == null ? void 0 : _c.step;
+    if (value != null && !import_lodash.default.isUndefined(step)) {
+      const s = step.toString();
+      const precision = ((_d = s.split(".")[1]) == null ? void 0 : _d.length) || 0;
+      const num = Number(value);
+      if (precision > 0) {
+        const factor = Math.pow(10, precision);
+        const rounded = Math.round(num * factor) / factor;
+        return rounded.toFixed(precision);
+      }
+      return num.toFixed(0);
+    }
+    return value;
+  }
 };
 __name(_NumberInterface, "NumberInterface");
 let NumberInterface = _NumberInterface;

package/lib/magic-attribute-model.js

@@ -126,6 +126,9 @@ const _MagicAttributeModel = class _MagicAttributeModel extends import_model.Mod
       return this;
     }
     if (!options) options = {};
+    if (this.dataValues[this.magicAttribute] === null) {
+      this.dataValues[this.magicAttribute] = {};
+    }
     if (!options.raw) {
       originalValue = this.dataValues[key];
     }

package/lib/operators/empty.d.ts

@@ -6,8 +6,5 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-declare const _default: {
-    $empty(_: any, ctx: any): any;
-    $notEmpty(_: any, ctx: any): any;
-};
+declare const _default: Record<string, any>;
 export default _default;

package/lib/operators/index.d.ts

@@ -7,7 +7,6 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 declare const _default: {
-    $empty(_: any, ctx: any): any;
-    $notEmpty(_: any, ctx: any): any;
+    [x: string]: any;
 };
 export default _default;

package/lib/options-parser.js

@@ -150,7 +150,7 @@ const _OptionsParser = class _OptionsParser {
     if (defaultSortField && !((_b = this.options) == null ? void 0 : _b.group)) {
       defaultSortField = import_lodash.default.castArray(defaultSortField);
       for (const key of defaultSortField) {
-        if (!sort.includes(key)) {
+        if (!sort.includes(key) && !sort.includes(`-${key}`)) {
           sort.push(key);
         }
       }

package/lib/query-interface/postgres-query-interface.d.ts

@@ -27,7 +27,9 @@ export default class PostgresQueryInterface extends QueryInterface {
         currentVal: number;
     }>;
     collectionTableExists(collection: Collection, options?: any): Promise<any>;
-    listViews(): Promise<[unknown[], unknown]>;
+    listViews(options?: {
+        schema?: string;
+    }): Promise<[unknown[], unknown]>;
     viewDef(viewName: string): Promise<string>;
     parseSQL(sql: string): any;
     viewColumnUsage(options: any): Promise<{