@nocobase/database 2.1.0-beta.46 → 2.1.0-beta.48

package/lib/collection.d.ts

@@ -30,10 +30,23 @@ export type DumpRules = BuiltInGroup | ({
     group: BuiltInGroup | string;
 } & BaseDumpRules);
 export type MigrationRule = 'overwrite' | 'skip' | 'upsert' | 'schema-only' | 'insert-ignore' | (string & {}) | null;
+/**
+ * `dataCategory = system` marks data that is foundational to system operation and should be treated as core runtime data.
+ * `dataCategory = business` marks data owned by plugin features and used as part of the plugin's business domain.
+ * `dataCategory = runtime` excludes the collection's data from backup snapshots.
+ */
+export type DataCategory = 'system' | 'business' | 'runtime';
+export type DataCategories = DataCategory | DataCategory[];
+export declare const TAG: {
+    basic: string;
+    business: string;
+    ignoredBackup: string;
+};
 export interface CollectionOptions extends Omit<ModelOptions, 'name' | 'hooks'> {
     name: string;
     title?: string;
     namespace?: string;
+    dataCategory?: DataCategories;
     migrationRules?: MigrationRule[];
     dumpRules?: DumpRules;
     tableName?: string;
@@ -81,6 +94,7 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     model: ModelStatic<Model>;
     repository: Repository<TModelAttributes, TCreationAttributes>;
     constructor(options: CollectionOptions, context: CollectionContext);
+    get dataCategory(): DataCategories;
     get underscored(): boolean;
     get filterTargetKey(): string | string[];
     get name(): string;

package/lib/collection.js

@@ -45,7 +45,8 @@ var __decorateClass = (decorators, target, key, kind) => {
 };
 var collection_exports = {};
 __export(collection_exports, {
-  Collection: () => Collection
+  Collection: () => Collection,
+  TAG: () => TAG
 });
 module.exports = __toCommonJS(collection_exports);
 var import_deepmerge = __toESM(require("deepmerge"));
@@ -89,6 +90,11 @@ function EnsureAtomicity(target, propertyKey, descriptor) {
   return descriptor;
 }
 __name(EnsureAtomicity, "EnsureAtomicity");
+const TAG = {
+  basic: "basic",
+  business: "business",
+  ignoredBackup: "ignored:backup"
+};
 const _Collection = class _Collection extends import_events.EventEmitter {
   options;
   context;
@@ -112,6 +118,9 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     this.setRepository(options.repository);
     this.setSortable(options.sortable);
   }
+  get dataCategory() {
+    return this.options.dataCategory;
+  }
   get underscored() {
     return this.options.underscored;
   }
@@ -817,5 +826,6 @@ __decorateClass([
 let Collection = _Collection;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Collection
+  Collection,
+  TAG
 });

package/lib/database.js

@@ -224,6 +224,7 @@ const _Database = class _Database extends import_events.EventEmitter {
     });
     this.collection({
       name: "migrations",
+      dataCategory: "system",
       autoGenId: false,
       timestamps: false,
       dumpRules: "required",

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

@@ -7,6 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { DataTypes } from 'sequelize';
+import type { UpdateOptions } from 'sequelize';
+import { Model } from '../model';
 import { BaseColumnFieldOptions, Field } from './field';
 export interface PasswordFieldOptions extends BaseColumnFieldOptions {
     type: 'password';
@@ -20,11 +22,15 @@ export interface PasswordFieldOptions extends BaseColumnFieldOptions {
     randomBytesSize?: number;
 }
 type PasswordValue = string | number;
+type BulkUpdateOptions = UpdateOptions<Record<string, unknown>> & {
+    attributes?: Record<string, unknown>;
+};
 export declare class PasswordField extends Field {
     get dataType(): DataTypes.StringDataTypeConstructor;
-    verify(password: PasswordValue, hash: string): Promise<unknown>;
-    hash(password: PasswordValue): Promise<unknown>;
-    init(): void;
+    listener: (instances: Model | Model[]) => Promise<void>;
+    bulkUpdateListener: (options: BulkUpdateOptions) => Promise<void>;
+    verify(password: PasswordValue, hash: string): Promise<boolean>;
+    hash(password: PasswordValue): Promise<string>;
     bind(): void;
     unbind(): void;
 }

package/lib/fields/password-field.js

@@ -47,6 +47,41 @@ const _PasswordField = class _PasswordField extends import_field.Field {
   get dataType() {
     return import_sequelize.DataTypes.STRING;
   }
+  listener = /* @__PURE__ */ __name(async (instances) => {
+    const { name } = this.options;
+    const fieldName = name;
+    instances = Array.isArray(instances) ? instances : [instances];
+    for (const instance of instances) {
+      if (!instance.changed(fieldName)) {
+        continue;
+      }
+      const value = instance.get(fieldName);
+      if (value !== null && value !== void 0 && value !== "") {
+        const password = typeof value === "number" ? value : String(value);
+        const hash = await this.hash(password);
+        instance.set(fieldName, hash);
+      } else {
+        instance.set(fieldName, instance.previous(fieldName));
+      }
+    }
+  }, "listener");
+  bulkUpdateListener = /* @__PURE__ */ __name(async (options) => {
+    var _a;
+    const { name } = this.options;
+    const fieldName = name;
+    const { attributes } = options;
+    if (!attributes || !Object.prototype.hasOwnProperty.call(attributes, fieldName)) {
+      return;
+    }
+    const value = attributes[fieldName];
+    if (value !== null && value !== void 0 && value !== "") {
+      const password = typeof value === "number" ? value : String(value);
+      attributes[fieldName] = await this.hash(password);
+    } else {
+      delete attributes[fieldName];
+      options.fields = (_a = options.fields) == null ? void 0 : _a.filter((field) => field !== fieldName);
+    }
+  }, "bulkUpdateListener");
   async verify(password, hash) {
     const passwordString = password === null || password === void 0 ? "" : String(password);
     hash = hash || "";
@@ -71,37 +106,19 @@ const _PasswordField = class _PasswordField extends import_field.Field {
       });
     });
   }
-  init() {
-    const { name } = this.options;
-    const fieldName = name;
-    this.listener = async (instances) => {
-      instances = Array.isArray(instances) ? instances : [instances];
-      for (const instance of instances) {
-        if (!instance.changed(fieldName)) {
-          continue;
-        }
-        const value = instance.get(fieldName);
-        if (value !== null && value !== void 0 && value !== "") {
-          const password = typeof value === "number" ? value : String(value);
-          const hash = await this.hash(password);
-          instance.set(fieldName, hash);
-        } else {
-          instance.set(fieldName, instance.previous(fieldName));
-        }
-      }
-    };
-  }
   bind() {
     super.bind();
     this.on("beforeCreate", this.listener);
     this.on("beforeBulkCreate", this.listener);
     this.on("beforeUpdate", this.listener);
+    this.on("beforeBulkUpdate", this.bulkUpdateListener);
   }
   unbind() {
     super.unbind();
     this.off("beforeCreate", this.listener);
     this.off("beforeBulkCreate", this.listener);
     this.off("beforeUpdate", this.listener);
+    this.off("beforeBulkUpdate", this.bulkUpdateListener);
   }
 };
 __name(_PasswordField, "PasswordField");

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.1.0-beta.46",
+  "version": "2.1.0-beta.48",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "2.1.0-beta.46",
-    "@nocobase/utils": "2.1.0-beta.46",
+    "@nocobase/logger": "2.1.0-beta.48",
+    "@nocobase/utils": "2.1.0-beta.48",
     "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": "91fd3ab238a5ff58735bbfca04a8cb05d233b0af"
+  "gitHead": "f8c27a286db015c5e433b48241f14c0412e50530"
 }