@nocobase/database 0.8.0-alpha.7 → 0.8.0-alpha.9

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

@@ -19,11 +19,12 @@ export interface SequenceFieldOptions extends BaseColumnFieldOptions {
     patterns: PatternConfig[];
 }
 export declare class SequenceField extends Field {
+    matcher: RegExp;
     get dataType(): DataTypes.StringDataTypeConstructor;
     constructor(options: SequenceFieldOptions, context: FieldContext);
     setValue: (instance: Model, options: any) => Promise<void>;
     setLast: (instance: Model, options: any) => void;
-    match(value: any): any;
+    match(value: any): RegExpMatchArray;
     parse(value: string, patternIndex: number): string;
     bind(): void;
     unbind(): void;

package/lib/fields/sequence-field.js

@@ -104,7 +104,7 @@ sequencePatterns.register('integer', {
           lastRecord = _this$options$lastRec === void 0 ? null : _this$options$lastRec;
 
     if (typeof options.current === 'undefined') {
-      if (lastRecord) {
+      if (lastRecord && lastRecord.get(this.options.name)) {
         // if match current pattern
         const matcher = this.match(lastRecord.get(this.options.name));
 
@@ -196,6 +196,7 @@ class SequenceField extends _field.Field {
 
     super(_options, context);
     _this = this;
+    this.matcher = void 0;
 
     this.setValue = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (instance, options) {
@@ -258,7 +259,7 @@ class SequenceField extends _field.Field {
   }
 
   match(value) {
-    return value.match(this.matcher);
+    return typeof value === 'string' ? value.match(this.matcher) : null;
   }
 
   parse(value, patternIndex) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/database",
-  "version": "0.8.0-alpha.7",
+  "version": "0.8.0-alpha.9",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -12,7 +12,7 @@
     }
   ],
   "dependencies": {
-    "@nocobase/utils": "0.8.0-alpha.7",
+    "@nocobase/utils": "0.8.0-alpha.9",
     "async-mutex": "^0.3.2",
     "cron-parser": "4.4.0",
     "deepmerge": "^4.2.2",
@@ -32,5 +32,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "8d6ee41e3ff401922cd8d2d93bc15e289cdf2977"
+  "gitHead": "6afe02d59bb22df0f96a7605c9001dcc17a30d6a"
 }

package/src/__tests__/fields/sequence-field.test.ts

@@ -216,6 +216,31 @@ describe('string field', () => {
       const item4 = await TestModel.create();
       expect(item4.get('name')).toBe('1');
     });
+
+    it('last record has no value of this field', async () => {
+      const testCollection = db.collection({
+        name: 'tests',
+        fields: [],
+      });
+      await db.sync();
+
+      const TestModel = db.getModel('tests');
+      const item1 = await TestModel.create();
+      expect(item1.get('name')).toBeUndefined();
+
+      testCollection.addField('name', {
+        type: 'sequence',
+        patterns: [
+          {
+            type: 'integer'
+          }
+        ]
+      });
+      await db.sync();
+
+      const item2 = await TestModel.create();
+      expect(item2.get('name')).toBe('0');
+    });
   });
 
   describe('date pattern', () => {

package/src/fields/sequence-field.ts

@@ -44,7 +44,7 @@ sequencePatterns.register('integer', {
     const { lastRecord = null } = this.options;
 
     if (typeof options.current === 'undefined') {
-      if (lastRecord) {
+      if (lastRecord && lastRecord.get(this.options.name)) {
         // if match current pattern
         const matcher = this.match(lastRecord.get(this.options.name));
         if (matcher) {
@@ -115,6 +115,8 @@ export interface SequenceFieldOptions extends BaseColumnFieldOptions {
 }
 
 export class SequenceField extends Field {
+  matcher: RegExp;
+
   get dataType() {
     return DataTypes.STRING;
   }
@@ -170,7 +172,7 @@ export class SequenceField extends Field {
   };
 
   match(value) {
-    return value.match(this.matcher);
+    return typeof value === 'string' ? value.match(this.matcher) : null;
   }
 
   parse(value: string, patternIndex: number): string {