@nocobase/database 1.5.0-alpha.5 → 1.5.0-beta.2

package/lib/fields/index.d.ts

@@ -20,6 +20,7 @@ import { DecimalFieldOptions, DoubleFieldOptions, FloatFieldOptions, IntegerFiel
 import { PasswordFieldOptions } from './password-field';
 import { RadioFieldOptions } from './radio-field';
 import { SetFieldOptions } from './set-field';
+import { SortFieldOptions } from './sort-field';
 import { StringFieldOptions } from './string-field';
 import { TextFieldOptions } from './text-field';
 import { TimeFieldOptions } from './time-field';
@@ -51,6 +52,7 @@ export * from './password-field';
 export * from './radio-field';
 export * from './relation-field';
 export * from './set-field';
+export * from './sort-field';
 export * from './string-field';
 export * from './text-field';
 export * from './time-field';
@@ -60,4 +62,4 @@ 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 type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | SortFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | DatetimeTzFieldOptions | DatetimeNoTzFieldOptions | DateOnlyFieldOptions | UnixTimestampFieldOptions | UidFieldOptions | UUIDFieldOptions | NanoidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions | EncryptionField;

package/lib/fields/index.js

@@ -42,6 +42,7 @@ __reExport(fields_exports, require("./password-field"), module.exports);
 __reExport(fields_exports, require("./radio-field"), module.exports);
 __reExport(fields_exports, require("./relation-field"), module.exports);
 __reExport(fields_exports, require("./set-field"), module.exports);
+__reExport(fields_exports, require("./sort-field"), module.exports);
 __reExport(fields_exports, require("./string-field"), module.exports);
 __reExport(fields_exports, require("./text-field"), module.exports);
 __reExport(fields_exports, require("./time-field"), module.exports);
@@ -72,6 +73,7 @@ __reExport(fields_exports, require("./unix-timestamp-field"), module.exports);
   ...require("./radio-field"),
   ...require("./relation-field"),
   ...require("./set-field"),
+  ...require("./sort-field"),
   ...require("./string-field"),
   ...require("./text-field"),
   ...require("./time-field"),

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

@@ -0,0 +1,22 @@
+/**
+ * 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';
+export declare class SortField extends Field {
+    get dataType(): DataTypes.BigIntDataTypeConstructor;
+    setSortValue: (instance: any, options: any) => Promise<void>;
+    onScopeChange: (instance: any, options: any) => Promise<void>;
+    initRecordsSortValue: (options: any) => Promise<void>;
+    bind(): void;
+    unbind(): void;
+}
+export interface SortFieldOptions extends BaseColumnFieldOptions {
+    type: 'sort';
+    scopeKey?: string;
+}

package/lib/fields/sort-field.js

@@ -0,0 +1,197 @@
+/**
+ * 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 __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 sort_field_exports = {};
+__export(sort_field_exports, {
+  SortField: () => SortField
+});
+module.exports = __toCommonJS(sort_field_exports);
+var import_async_mutex = require("async-mutex");
+var import_lodash = require("lodash");
+var import_sequelize = require("sequelize");
+var import_field = require("./field");
+const sortFieldMutex = new import_async_mutex.Mutex();
+const _SortField = class _SortField extends import_field.Field {
+  get dataType() {
+    return import_sequelize.DataTypes.BIGINT;
+  }
+  setSortValue = /* @__PURE__ */ __name(async (instance, options) => {
+    const { name, scopeKey } = this.options;
+    const { model } = this.context.collection;
+    if ((0, import_lodash.isNumber)(instance.get(name)) && instance._previousDataValues[scopeKey] == instance[scopeKey]) {
+      return;
+    }
+    const where = {};
+    if (scopeKey) {
+      const value = instance.get(scopeKey);
+      if (value !== void 0 && value !== null) {
+        where[scopeKey] = value;
+      }
+    }
+    await sortFieldMutex.runExclusive(async () => {
+      const max = await model.max(name, { ...options, where });
+      const newValue = (max || 0) + 1;
+      instance.set(name, newValue);
+    });
+  }, "setSortValue");
+  onScopeChange = /* @__PURE__ */ __name(async (instance, options) => {
+    const { scopeKey } = this.options;
+    if (scopeKey && !instance.isNewRecord && instance._previousDataValues[scopeKey] != instance[scopeKey]) {
+      await this.setSortValue(instance, options);
+    }
+  }, "onScopeChange");
+  initRecordsSortValue = /* @__PURE__ */ __name(async (options) => {
+    const { transaction } = options;
+    const orderField = (() => {
+      const model = this.collection.model;
+      if (model.primaryKeyAttribute) {
+        return model.primaryKeyAttribute;
+      }
+      if (model.rawAttributes["createdAt"]) {
+        return model.rawAttributes["createdAt"].field;
+      }
+      throw new Error(`can not find order key for collection ${this.collection.name}`);
+    })();
+    const needInit = /* @__PURE__ */ __name(async (scopeKey2 = null, scopeValue = null) => {
+      const filter = {};
+      if (scopeKey2 && scopeValue) {
+        filter[scopeKey2] = scopeValue;
+      }
+      const totalCount = await this.collection.repository.count({
+        filter,
+        transaction
+      });
+      const emptyCount = await this.collection.repository.count({
+        filter: {
+          [this.name]: null,
+          ...filter
+        },
+        transaction
+      });
+      return emptyCount === totalCount && emptyCount > 0;
+    }, "needInit");
+    const doInit = /* @__PURE__ */ __name(async (scopeKey2 = null, scopeValue = null) => {
+      const queryInterface = this.collection.db.sequelize.getQueryInterface();
+      if (scopeKey2) {
+        const scopeAttribute = this.collection.model.rawAttributes[scopeKey2];
+        if (!scopeAttribute) {
+          throw new Error(`can not find scope field ${scopeKey2} for collection ${this.collection.name}`);
+        }
+        scopeKey2 = scopeAttribute.field;
+      }
+      const quotedOrderField = queryInterface.quoteIdentifier(orderField);
+      const sortColumnName = queryInterface.quoteIdentifier(this.collection.model.rawAttributes[this.name].field);
+      let sql;
+      const whereClause = scopeKey2 && scopeValue ? (() => {
+        const filteredScopeValue = scopeValue.filter((v) => v !== null);
+        if (filteredScopeValue.length === 0) {
+          return "";
+        }
+        const initialClause = `
+  WHERE ${queryInterface.quoteIdentifier(scopeKey2)} IN (${filteredScopeValue.map((v) => `'${v}'`).join(", ")})`;
+        const nullCheck = scopeValue.includes(null) ? ` OR ${queryInterface.quoteIdentifier(scopeKey2)} IS NULL` : "";
+        return initialClause + nullCheck;
+      })() : "";
+      if (this.collection.db.inDialect("postgres")) {
+        sql = `
+    UPDATE ${this.collection.quotedTableName()}
+    SET ${sortColumnName} = ordered_table.new_sequence_number
+    FROM (
+      SELECT *, ROW_NUMBER() OVER (${scopeKey2 ? `PARTITION BY ${queryInterface.quoteIdentifier(scopeKey2)}` : ""} ORDER BY ${quotedOrderField}) AS new_sequence_number
+      FROM ${this.collection.quotedTableName()}
+      ${whereClause}
+    ) AS ordered_table
+    WHERE ${this.collection.quotedTableName()}.${quotedOrderField} = ordered_table.${quotedOrderField};
+  `;
+      } else if (this.collection.db.inDialect("sqlite")) {
+        sql = `
+    UPDATE ${this.collection.quotedTableName()}
+    SET ${sortColumnName} = (
+      SELECT new_sequence_number
+      FROM (
+        SELECT *, ROW_NUMBER() OVER (${scopeKey2 ? `PARTITION BY ${queryInterface.quoteIdentifier(scopeKey2)}` : ""} ORDER BY ${quotedOrderField}) AS new_sequence_number
+        FROM ${this.collection.quotedTableName()}
+        ${whereClause}
+      ) AS ordered_table
+      WHERE ${this.collection.quotedTableName()}.${quotedOrderField} = ordered_table.${quotedOrderField}
+    );
+  `;
+      } else if (this.collection.db.inDialect("mysql") || this.collection.db.inDialect("mariadb")) {
+        sql = `
+    UPDATE ${this.collection.quotedTableName()}
+    JOIN (
+      SELECT *, ROW_NUMBER() OVER (${scopeKey2 ? `PARTITION BY ${queryInterface.quoteIdentifier(scopeKey2)}` : ""} ORDER BY ${quotedOrderField}) AS new_sequence_number
+      FROM ${this.collection.quotedTableName()}
+      ${whereClause}
+    ) AS ordered_table ON ${this.collection.quotedTableName()}.${quotedOrderField} = ordered_table.${quotedOrderField}
+    SET ${this.collection.quotedTableName()}.${sortColumnName} = ordered_table.new_sequence_number;
+  `;
+      }
+      await this.collection.db.sequelize.query(sql, {
+        transaction
+      });
+    }, "doInit");
+    const scopeKey = this.options.scopeKey;
+    if (scopeKey) {
+      const scopeKeyColumn = this.collection.model.rawAttributes[scopeKey].field;
+      const groups = await this.collection.model.findAll({
+        attributes: [[import_sequelize.Sequelize.fn("DISTINCT", import_sequelize.Sequelize.col(scopeKeyColumn)), scopeKey]],
+        raw: true,
+        transaction
+      });
+      const needInitGroups = [];
+      for (const group of groups) {
+        if (await needInit(scopeKey, group[scopeKey])) {
+          needInitGroups.push(group[scopeKey]);
+        }
+      }
+      if (needInitGroups.length > 0) {
+        await doInit(scopeKey, needInitGroups);
+      }
+    } else if (await needInit()) {
+      await doInit();
+    }
+  }, "initRecordsSortValue");
+  bind() {
+    super.bind();
+    this.on("afterSync", this.initRecordsSortValue);
+    this.on("beforeUpdate", this.onScopeChange);
+    this.on("beforeCreate", this.setSortValue);
+  }
+  unbind() {
+    super.unbind();
+    this.off("beforeUpdate", this.onScopeChange);
+    this.off("beforeCreate", this.setSortValue);
+    this.off("afterSync", this.initRecordsSortValue);
+  }
+};
+__name(_SortField, "SortField");
+let SortField = _SortField;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SortField
+});

package/lib/update-associations.js

@@ -258,7 +258,11 @@ async function updateSingleAssociation(model, key, value, options = {}) {
         return;
       }
       if (updateAssociationValues.includes(key)) {
-        await instance2.update(value, { ...options, transaction });
+        const updateValues = { ...value };
+        if (association.associationType === "HasOne") {
+          delete updateValues[association.foreignKey];
+        }
+        await instance2.update(updateValues, { ...options, transaction });
       }
       await updateAssociations(instance2, value, {
         ...options,
@@ -298,7 +302,7 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
   const setAccessor = association.accessors.set;
   const createAccessor = association.accessors.create;
   if (isUndefinedOrNull(value)) {
-    await model[setAccessor](null, { transaction, context, individualHooks: true });
+    await model[setAccessor](null, { transaction, context, individualHooks: true, validate: false });
     model.setDataValue(key, null);
     return;
   }
@@ -306,7 +310,7 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
     throw new Error(`The source key ${association.sourceKeyAttribute} is not set in ${model.constructor.name}`);
   }
   if (isStringOrNumber(value)) {
-    await model[setAccessor](value, { transaction, context, individualHooks: true });
+    await model[setAccessor](value, { transaction, context, individualHooks: true, validate: false });
     return;
   }
   value = import_lodash.default.castArray(value);
@@ -334,7 +338,7 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
       objectItems.push(item);
     }
   }
-  await model[setAccessor](setItems, { transaction, context, individualHooks: true });
+  await model[setAccessor](setItems, { transaction, context, individualHooks: true, validate: false });
   const newItems = [];
   const pk = association.target.primaryKeyAttribute;
   let targetKey = pk;
@@ -393,6 +397,9 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
         continue;
       }
       if (updateAssociationValues.includes(key)) {
+        if (association.associationType === "HasMany") {
+          delete item[association.foreignKey];
+        }
         await instance.update(item, { ...options, transaction });
       }
       await updateAssociations(instance, item, {

package/lib/view/view-inference.js

@@ -62,7 +62,7 @@ const _ViewFieldInference = class _ViewFieldInference {
     });
     const rawFields = [];
     for (const [name, column] of Object.entries(columns)) {
-      const inferResult = { name, rawType: column.type };
+      const inferResult = { name, rawType: column.type, field: name };
       const usage = columnUsage[name];
       if (usage) {
         const collection = db.tableNameCollectionMap.get(

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.5.0-alpha.5",
+  "version": "1.5.0-beta.2",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.5.0-alpha.5",
-    "@nocobase/utils": "1.5.0-alpha.5",
+    "@nocobase/logger": "1.5.0-beta.2",
+    "@nocobase/utils": "1.5.0-beta.2",
     "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": "8d24e8d2c0f3f57ceaa271438fd93db2b4150011"
+  "gitHead": "8a9c29fdac5c6295dcc7abf00c3fa81bd9e01a36"
 }