@nocobase/database 0.8.0-alpha.9 → 0.8.1-alpha.4

package/src/utils.ts

@@ -1,6 +1,6 @@
 import crypto from 'crypto';
-import { Model } from './model';
 import { IdentifierError } from './errors/identifier-error';
+import { Model } from './model';
 
 type HandleAppendsQueryOptions = {
   templateModel: any;
@@ -10,6 +10,10 @@ type HandleAppendsQueryOptions = {
 export async function handleAppendsQuery(options: HandleAppendsQueryOptions) {
   const { templateModel, queryPromises } = options;
 
+  if (!templateModel) {
+    return [];
+  }
+
   const primaryKey = templateModel.constructor.primaryKeyAttribute;
 
   const results = await Promise.all(queryPromises);

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

@@ -1,32 +0,0 @@
-import { DataTypes } from 'sequelize';
-import { Registry } from '@nocobase/utils';
-import { Model } from '..';
-import { BaseColumnFieldOptions, Field, FieldContext } from './field';
-interface Pattern {
-    validate?(options: any): string | null;
-    generate(this: SequenceField, instance: Model, index: number): string;
-    getLength(options: any): number;
-    getMatcher(options: any): string;
-}
-export declare const sequencePatterns: Registry<Pattern>;
-interface PatternConfig {
-    type: string;
-    title?: string;
-    options?: any;
-}
-export interface SequenceFieldOptions extends BaseColumnFieldOptions {
-    type: 'sequence';
-    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): RegExpMatchArray;
-    parse(value: string, patternIndex: number): string;
-    bind(): void;
-    unbind(): void;
-}
-export {};

package/lib/fields/sequence-field.js

@@ -1,300 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.sequencePatterns = exports.SequenceField = void 0;
-
-function _sequelize() {
-  const data = require("sequelize");
-
-  _sequelize = function _sequelize() {
-    return data;
-  };
-
-  return data;
-}
-
-function _cronParser() {
-  const data = _interopRequireDefault(require("cron-parser"));
-
-  _cronParser = function _cronParser() {
-    return data;
-  };
-
-  return data;
-}
-
-function _moment() {
-  const data = _interopRequireDefault(require("moment"));
-
-  _moment = function _moment() {
-    return data;
-  };
-
-  return data;
-}
-
-function _lodash() {
-  const data = require("lodash");
-
-  _lodash = function _lodash() {
-    return data;
-  };
-
-  return data;
-}
-
-function _utils() {
-  const data = require("@nocobase/utils");
-
-  _utils = function _utils() {
-    return data;
-  };
-
-  return data;
-}
-
-var _field = require("./field");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-const sequencePatterns = new (_utils().Registry)();
-exports.sequencePatterns = sequencePatterns;
-sequencePatterns.register('string', {
-  validate(options) {
-    if (!(options === null || options === void 0 ? void 0 : options.value)) {
-      return 'options.value should be configured as a non-empty string';
-    }
-
-    return null;
-  },
-
-  generate(instance, index) {
-    const options = this.options.patterns[index].options;
-    return options.value;
-  },
-
-  getLength(options) {
-    return options.value.length;
-  },
-
-  getMatcher(options) {
-    return (0, _lodash().escapeRegExp)(options.value);
-  }
-
-});
-sequencePatterns.register('integer', {
-  generate(instance, index) {
-    const _this$options$pattern = this.options.patterns[index].options,
-          options = _this$options$pattern === void 0 ? {} : _this$options$pattern;
-    const _options$digits = options.digits,
-          digits = _options$digits === void 0 ? 1 : _options$digits,
-          _options$start = options.start,
-          start = _options$start === void 0 ? 0 : _options$start,
-          _options$base = options.base,
-          base = _options$base === void 0 ? 10 : _options$base,
-          cycle = options.cycle;
-    const max = Math.pow(base, digits) - 1;
-    const _this$options$lastRec = this.options.lastRecord,
-          lastRecord = _this$options$lastRec === void 0 ? null : _this$options$lastRec;
-
-    if (typeof options.current === 'undefined') {
-      if (lastRecord && lastRecord.get(this.options.name)) {
-        // if match current pattern
-        const matcher = this.match(lastRecord.get(this.options.name));
-
-        if (matcher) {
-          const lastNumber = Number.parseInt(matcher[index + 1], base);
-          options.current = Number.isNaN(lastNumber) ? start : lastNumber + 1;
-        } else {
-          options.current = start;
-        }
-      } else {
-        options.current = start;
-      }
-    } else {
-      options.current += 1;
-    } // cycle as cron string
-
-
-    if (cycle && lastRecord) {
-      const interval = _cronParser().default.parseExpression(cycle, {
-        currentDate: lastRecord.get('createdAt')
-      });
-
-      const next = interval.next();
-
-      if (instance.get('createdAt').getTime() >= next.getTime()) {
-        options.current = start;
-      }
-    }
-
-    if (options.current > max) {
-      options.current = start;
-    } // update options
-
-
-    Object.assign(this.options.patterns[index], {
-      options
-    });
-    return options.current.toString(base).padStart(digits, '0');
-  },
-
-  getLength({
-    digits = 1
-  } = {}) {
-    return digits;
-  },
-
-  getMatcher(options = {}) {
-    const _options$digits2 = options.digits,
-          digits = _options$digits2 === void 0 ? 1 : _options$digits2,
-          _options$start2 = options.start,
-          start = _options$start2 === void 0 ? 0 : _options$start2,
-          _options$base2 = options.base,
-          base = _options$base2 === void 0 ? 10 : _options$base2;
-    const startLen = start ? start.toString(base).length : 1;
-    const chars = '0123456789abcdefghijklmnopqrstuvwxyz'.slice(0, base);
-    return `[${chars}]{${digits}}`;
-  }
-
-});
-sequencePatterns.register('date', {
-  generate(instance, index) {
-    var _options$field, _options$format;
-
-    const options = this.options.patterns[index].options;
-    return (0, _moment().default)(instance.get((_options$field = options === null || options === void 0 ? void 0 : options.field) !== null && _options$field !== void 0 ? _options$field : 'createdAt')).format((_options$format = options === null || options === void 0 ? void 0 : options.format) !== null && _options$format !== void 0 ? _options$format : 'YYYYMMDD');
-  },
-
-  getLength(options) {
-    var _options$format$lengt, _options$format2;
-
-    return (_options$format$lengt = (_options$format2 = options.format) === null || _options$format2 === void 0 ? void 0 : _options$format2.length) !== null && _options$format$lengt !== void 0 ? _options$format$lengt : 8;
-  },
-
-  getMatcher(options = {}) {
-    var _options$format$lengt2, _options$format3;
-
-    return `.{${(_options$format$lengt2 = options === null || options === void 0 ? void 0 : (_options$format3 = options.format) === null || _options$format3 === void 0 ? void 0 : _options$format3.length) !== null && _options$format$lengt2 !== void 0 ? _options$format$lengt2 : 8}}`;
-  }
-
-});
-
-class SequenceField extends _field.Field {
-  get dataType() {
-    return _sequelize().DataTypes.STRING;
-  }
-
-  constructor(_options, context) {
-    var _this;
-
-    super(_options, context);
-    _this = this;
-    this.matcher = void 0;
-
-    this.setValue = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator(function* (instance, options) {
-        const _this$options = _this.options,
-              name = _this$options.name,
-              patterns = _this$options.patterns; // NOTE: only load when value is not set, if null stand for no last record
-
-        if (typeof _this.options.lastRecord === 'undefined') {
-          const model = instance.constructor;
-          _this.options.lastRecord = yield model.findOne({
-            attributes: [model.primaryKeyAttribute, _this.options.name, 'createdAt'],
-            order: [['createdAt', 'DESC'], // TODO(bug): will cause problem if no auto-increment id
-            [model.primaryKeyAttribute, 'DESC']],
-            transaction: options.transaction
-          });
-        }
-
-        const results = patterns.reduce((result, p, i) => {
-          const item = sequencePatterns.get(p.type).generate.call(_this, instance, i, options);
-          return result.concat(item);
-        }, []);
-        instance.set(name, results.join(''));
-      });
-
-      return function (_x, _x2) {
-        return _ref.apply(this, arguments);
-      };
-    }();
-
-    this.setLast = (instance, options) => {
-      this.options.lastRecord = instance;
-    };
-
-    if (!_options.patterns || !_options.patterns.length) {
-      throw new Error('at least one pattern should be defined for sequence type');
-    }
-
-    _options.patterns.forEach(pattern => {
-      const P = sequencePatterns.get(pattern.type);
-
-      if (!P) {
-        throw new Error(`pattern type ${pattern.type} is not registered`);
-      }
-
-      if (P.validate) {
-        const error = P.validate(pattern.options);
-
-        if (error) {
-          throw new Error(error);
-        }
-      }
-    });
-
-    const _patterns = _options.patterns.map(({
-      type,
-      options
-    }) => sequencePatterns.get(type).getMatcher(options));
-
-    this.matcher = new RegExp(`^${_patterns.map(p => `(${p})`).join('')}$`, 'i');
-  }
-
-  match(value) {
-    return typeof value === 'string' ? value.match(this.matcher) : null;
-  }
-
-  parse(value, patternIndex) {
-    for (let i = 0, index = 0; i < this.options.patterns.length; i += 1) {
-      const _this$options$pattern2 = this.options.patterns[i],
-            type = _this$options$pattern2.type,
-            options = _this$options$pattern2.options;
-
-      const _sequencePatterns$get = sequencePatterns.get(type),
-            getLength = _sequencePatterns$get.getLength;
-
-      const length = getLength(options);
-
-      if (i === patternIndex) {
-        return value.substring(index, index + length);
-      }
-
-      index += length;
-    }
-
-    return '';
-  }
-
-  bind() {
-    super.bind();
-    this.on('beforeCreate', this.setValue);
-    this.on('afterCreate', this.setLast);
-  }
-
-  unbind() {
-    super.unbind();
-    this.off('beforeCreate', this.setValue);
-    this.off('afterCreate', this.setLast);
-  }
-
-}
-
-exports.SequenceField = SequenceField;