@nocobase/database 0.7.3-alpha.1 → 0.7.4-alpha.1

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

@@ -3,8 +3,11 @@ import { BaseColumnFieldOptions, Field } from './field';
 export declare class UidField extends Field {
     get dataType(): DataTypes.StringDataTypeConstructor;
     init(): void;
+    bind(): void;
+    unbind(): void;
 }
 export interface UidFieldOptions extends BaseColumnFieldOptions {
     type: 'uid';
     prefix?: string;
+    pattern?: string;
 }

package/lib/fields/uid-field.js

@@ -40,19 +40,39 @@ class UidField extends _field.Field {
     const _this$options = this.options,
           name = _this$options.name,
           _this$options$prefix = _this$options.prefix,
-          prefix = _this$options$prefix === void 0 ? '' : _this$options$prefix;
-    const model = this.context.collection.model;
-    model.beforeCreate( /*#__PURE__*/function () {
+          prefix = _this$options$prefix === void 0 ? '' : _this$options$prefix,
+          pattern = _this$options.pattern;
+    const re = new RegExp(pattern || '^[A-Za-z0-9][A-Za-z0-9_-]*$');
+
+    this.listener = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (instance) {
-        if (!instance.get(name)) {
+        const value = instance.get(name);
+
+        if (!value) {
           instance.set(name, `${prefix}${(0, _utils().uid)()}`);
+        } else if (re.test(value)) {
+          instance.set(name, value);
+        } else {
+          throw new Error(`uid '${value}' is invalid`);
         }
       });
 
       return function (_x) {
         return _ref.apply(this, arguments);
       };
-    }());
+    }();
+  }
+
+  bind() {
+    super.bind();
+    this.on('beforeCreate', this.listener);
+    this.on('beforeUpdate', this.listener);
+  }
+
+  unbind() {
+    super.unbind();
+    this.off('beforeCreate', this.listener);
+    this.off('beforeUpdate', this.listener);
   }
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/database",
-  "version": "0.7.3-alpha.1",
+  "version": "0.7.4-alpha.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -12,7 +12,7 @@
     }
   ],
   "dependencies": {
-    "@nocobase/utils": "0.7.3-alpha.1",
+    "@nocobase/utils": "0.7.4-alpha.1",
     "async-mutex": "^0.3.2",
     "deepmerge": "^4.2.2",
     "flat": "^5.0.2",
@@ -30,5 +30,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "09597f41800ec567f64000e928cd68c28bb927e3"
+  "gitHead": "543eb1c0308bb72a5ba54f208586cd78bfda8fa9"
 }

package/src/fields/uid-field.ts

@@ -8,17 +8,35 @@ export class UidField extends Field {
   }
 
   init() {
-    const { name, prefix = '' } = this.options;
-    const { model } = this.context.collection;
-    model.beforeCreate(async (instance) => {
-      if (!instance.get(name)) {
+    const { name, prefix = '', pattern } = this.options;
+    const re = new RegExp(pattern || '^[A-Za-z0-9][A-Za-z0-9_-]*$');
+    this.listener = async (instance) => {
+      const value = instance.get(name);
+      if (!value) {
         instance.set(name, `${prefix}${uid()}`);
+      } else if (re.test(value)) {
+        instance.set(name, value);
+      } else {
+        throw new Error(`uid '${value}' is invalid`);
       }
-    });
+    };
+  }
+
+  bind() {
+    super.bind();
+    this.on('beforeCreate', this.listener);
+    this.on('beforeUpdate', this.listener);
+  }
+
+  unbind() {
+    super.unbind();
+    this.off('beforeCreate', this.listener);
+    this.off('beforeUpdate', this.listener);
   }
 }
 
 export interface UidFieldOptions extends BaseColumnFieldOptions {
   type: 'uid';
   prefix?: string;
+  pattern?: string;
 }