@nocobase/database 0.7.2-alpha.7 → 0.7.4-alpha.4

package/lib/database.d.ts

@@ -106,21 +106,18 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     closed(): any;
     close(): Promise<void>;
     on(event: string | symbol, listener: any): this;
+    extendCollection(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions): void;
     import(options: {
         directory: string;
         extensions?: ImportFileExtension[];
     }): Promise<Map<string, Collection>>;
     emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
 }
-export declare function extend(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions): {
+export declare function extendCollection(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions): {
     collectionOptions: CollectionOptions;
     mergeOptions: MergeOptions;
     extend: boolean;
 };
+export declare const extend: typeof extendCollection;
 export declare const defineCollection: (collectionOptions: CollectionOptions) => CollectionOptions;
-export declare const extendCollection: (collectionOptions: CollectionOptions, mergeOptions?: MergeOptions) => {
-    collectionOptions: CollectionOptions;
-    mergeOptions: MergeOptions;
-    extend: boolean;
-};
 export default Database;

package/lib/database.js

@@ -3,9 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defineCollection = exports.default = exports.Database = void 0;
-exports.extend = extend;
-exports.extendCollection = void 0;
+exports.extend = exports.defineCollection = exports.default = exports.Database = void 0;
+exports.extendCollection = extendCollection;
 
 function _utils() {
   const data = require("@nocobase/utils");
@@ -158,7 +157,7 @@ class DatabaseVersion {
         postgres: {
           sql: 'select version() as version',
           get: v => {
-            const keys = v.split(' ');
+            const keys = v.split(/\s|,/);
             keys.shift();
             return _semver().default.minVersion(keys.shift()).version;
           }
@@ -169,7 +168,7 @@ class DatabaseVersion {
         const dialect = _Object$keys[_i];
 
         if (_this.db.inDialect(dialect)) {
-          var _result$, _result$2;
+          var _result$;
 
           if (!(versions === null || versions === void 0 ? void 0 : versions[dialect])) {
             return false;
@@ -179,8 +178,7 @@ class DatabaseVersion {
                 _yield$_this$db$seque2 = _slicedToArray(_yield$_this$db$seque, 1),
                 result = _yield$_this$db$seque2[0];
 
-          console.log(`db version: ${dialects[dialect].get(result === null || result === void 0 ? void 0 : (_result$ = result[0]) === null || _result$ === void 0 ? void 0 : _result$.version)}`);
-          return _semver().default.satisfies(dialects[dialect].get(result === null || result === void 0 ? void 0 : (_result$2 = result[0]) === null || _result$2 === void 0 ? void 0 : _result$2.version), versions[dialect]);
+          return _semver().default.satisfies(dialects[dialect].get(result === null || result === void 0 ? void 0 : (_result$ = result[0]) === null || _result$ === void 0 ? void 0 : _result$.version), versions[dialect]);
         }
       }
 
@@ -216,7 +214,7 @@ class Database extends _events().EventEmitter {
         },
         force: false
       }
-    }, options);
+    }, _lodash().default.clone(options));
 
     if (options.storage && options.storage !== ':memory:') {
       if (!(0, _path().isAbsolute)(options.storage)) {
@@ -280,6 +278,11 @@ class Database extends _events().EventEmitter {
         sequelize: this.sequelize
       }))
     });
+    this.sequelize.beforeDefine((model, opts) => {
+      if (this.options.tablePrefix) {
+        opts.tableName = `${this.options.tablePrefix}${opts.tableName || opts.modelName || opts.name.plural}`;
+      }
+    });
   }
 
   addMigration(item) {
@@ -621,6 +624,21 @@ class Database extends _events().EventEmitter {
     return super.on(event, listener);
   }
 
+  extendCollection(collectionOptions, mergeOptions) {
+    const collectionName = collectionOptions.name;
+    const existCollection = this.getCollection(collectionName);
+
+    if (existCollection) {
+      existCollection.updateOptions(collectionOptions, mergeOptions);
+    } else {
+      const existDelayExtends = this.delayCollectionExtend.get(collectionName) || [];
+      this.delayCollectionExtend.set(collectionName, [...existDelayExtends, {
+        collectionOptions,
+        mergeOptions
+      }]);
+    }
+  }
+
   import(options) {
     var _this8 = this;
 
@@ -637,17 +655,7 @@ class Database extends _events().EventEmitter {
           const module = _step2.value;
 
           if (module.extend) {
-            const collectionName = module.collectionOptions.name;
-
-            const existCollection = _this8.getCollection(collectionName);
-
-            if (existCollection) {
-              existCollection.updateOptions(module.collectionOptions, module.mergeOptions);
-            } else {
-              const existDelayExtends = _this8.delayCollectionExtend.get(collectionName) || [];
-
-              _this8.delayCollectionExtend.set(collectionName, [...existDelayExtends, module]);
-            }
+            _this8.extendCollection(module.collectionOptions, module.mergeOptions);
           } else {
             const collection = _this8.collection(module);
 
@@ -668,7 +676,7 @@ class Database extends _events().EventEmitter {
 
 exports.Database = Database;
 
-function extend(collectionOptions, mergeOptions) {
+function extendCollection(collectionOptions, mergeOptions) {
   return {
     collectionOptions,
     mergeOptions,
@@ -676,21 +684,14 @@ function extend(collectionOptions, mergeOptions) {
   };
 }
 
+const extend = extendCollection;
+exports.extend = extend;
+
 const defineCollection = collectionOptions => {
   return collectionOptions;
 };
 
 exports.defineCollection = defineCollection;
-
-const extendCollection = (collectionOptions, mergeOptions) => {
-  return {
-    collectionOptions,
-    mergeOptions,
-    extend: true
-  };
-};
-
-exports.extendCollection = extendCollection;
 (0, _utils().applyMixins)(Database, [_utils().AsyncEmitter]);
 var _default = Database;
 exports.default = _default;

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/lib/mock-database.js

@@ -42,9 +42,6 @@ class MockDatabase extends _database.Database {
       tablePrefix: `mock_${(0, _utils().uid)(6)}_`,
       dialect: 'sqlite'
     }, options));
-    this.sequelize.beforeDefine((model, opts) => {
-      opts.tableName = `${this.getTablePrefix()}${opts.tableName || opts.modelName || opts.name.plural}`;
-    });
   }
 
 }

package/lib/repository.d.ts

@@ -44,7 +44,7 @@ export interface CommonFindOptions extends Transactionable {
     sort?: Sort;
     context?: any;
 }
-interface FindOneOptions extends FindOptions, CommonFindOptions {
+interface FindOneOptions extends FindOptions {
 }
 export interface DestroyOptions extends SequelizeDestroyOptions {
     filter?: Filter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/database",
-  "version": "0.7.2-alpha.7",
+  "version": "0.7.4-alpha.4",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -12,7 +12,7 @@
     }
   ],
   "dependencies": {
-    "@nocobase/utils": "0.7.2-alpha.7",
+    "@nocobase/utils": "0.7.4-alpha.4",
     "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": "c34194ae51395346b7cf1d1b6b5e127597d956ab"
+  "gitHead": "726c06b721b217a6aa5c1421b899d1315e552b57"
 }

package/src/__tests__/update-associations.test.ts

@@ -390,7 +390,7 @@ describe('update associations', () => {
     afterEach(async () => {
       await db.close();
     });
-    test.only('set through value', async () => {
+    test('set through value', async () => {
       const p1 = await Post.repository.create({
         values: {
           title: 'hello',

package/src/database.ts

@@ -86,7 +86,7 @@ class DatabaseVersion {
       postgres: {
         sql: 'select version() as version',
         get: (v) => {
-          const keys = v.split(' ');
+          const keys = v.split(/\s|,/);
           keys.shift();
           return semver.minVersion(keys.shift()).version;
         },
@@ -98,7 +98,6 @@ class DatabaseVersion {
           return false;
         }
         const [result] = (await this.db.sequelize.query(dialects[dialect].sql)) as any;
-        console.log(`db version: ${dialects[dialect].get(result?.[0]?.version)}`);
         return semver.satisfies(dialects[dialect].get(result?.[0]?.version), versions[dialect]);
       }
     }
@@ -136,7 +135,7 @@ export class Database extends EventEmitter implements AsyncEmitter {
         },
         force: false,
       },
-      ...options,
+      ...lodash.clone(options),
     };
 
     if (options.storage && options.storage !== ':memory:') {
@@ -198,6 +197,12 @@ export class Database extends EventEmitter implements AsyncEmitter {
         sequelize: this.sequelize,
       }),
     });
+
+    this.sequelize.beforeDefine((model, opts) => {
+      if (this.options.tablePrefix) {
+        opts.tableName = `${this.options.tablePrefix}${opts.tableName || opts.modelName || opts.name.plural}`;
+      }
+    });
   }
 
   addMigration(item) {
@@ -461,6 +466,18 @@ export class Database extends EventEmitter implements AsyncEmitter {
     return super.on(event, listener);
   }
 
+  extendCollection(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions) {
+    const collectionName = collectionOptions.name;
+    const existCollection = this.getCollection(collectionName);
+    if (existCollection) {
+      existCollection.updateOptions(collectionOptions, mergeOptions);
+    } else {
+      const existDelayExtends = this.delayCollectionExtend.get(collectionName) || [];
+
+      this.delayCollectionExtend.set(collectionName, [...existDelayExtends, { collectionOptions, mergeOptions }]);
+    }
+  }
+
   async import(options: { directory: string; extensions?: ImportFileExtension[] }): Promise<Map<string, Collection>> {
     const reader = new ImporterReader(options.directory, options.extensions);
     const modules = await reader.read();
@@ -468,15 +485,7 @@ export class Database extends EventEmitter implements AsyncEmitter {
 
     for (const module of modules) {
       if (module.extend) {
-        const collectionName = module.collectionOptions.name;
-        const existCollection = this.getCollection(collectionName);
-        if (existCollection) {
-          existCollection.updateOptions(module.collectionOptions, module.mergeOptions);
-        } else {
-          const existDelayExtends = this.delayCollectionExtend.get(collectionName) || [];
-
-          this.delayCollectionExtend.set(collectionName, [...existDelayExtends, module]);
-        }
+        this.extendCollection(module.collectionOptions, module.mergeOptions);
       } else {
         const collection = this.collection(module);
         result.set(collection.name, collection);
@@ -489,7 +498,7 @@ export class Database extends EventEmitter implements AsyncEmitter {
   declare emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
 }
 
-export function extend(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions) {
+export function extendCollection(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions) {
   return {
     collectionOptions,
     mergeOptions,
@@ -497,18 +506,12 @@ export function extend(collectionOptions: CollectionOptions, mergeOptions?: Merg
   };
 }
 
+export const extend = extendCollection;
+
 export const defineCollection = (collectionOptions: CollectionOptions) => {
   return collectionOptions;
 };
 
-export const extendCollection = (collectionOptions: CollectionOptions, mergeOptions?: MergeOptions) => {
-  return {
-    collectionOptions,
-    mergeOptions,
-    extend: true,
-  };
-};
-
 applyMixins(Database, [AsyncEmitter]);
 
 export default Database;

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;
 }

package/src/mock-database.ts

@@ -10,9 +10,6 @@ export class MockDatabase extends Database {
       dialect: 'sqlite',
       ...options,
     });
-    this.sequelize.beforeDefine((model, opts) => {
-      opts.tableName = `${this.getTablePrefix()}${opts.tableName || opts.modelName || opts.name.plural}`;
-    });
   }
 }
 

package/src/repository.ts

@@ -75,7 +75,7 @@ export interface CommonFindOptions extends Transactionable {
   context?: any;
 }
 
-interface FindOneOptions extends FindOptions, CommonFindOptions {}
+interface FindOneOptions extends FindOptions {}
 
 export interface DestroyOptions extends SequelizeDestroyOptions {
   filter?: Filter;