@nocobase/database 0.8.0-alpha.8 → 0.8.1-alpha.3

package/lib/fields/index.js

@@ -3,21 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {
-  SequenceField: true
-};
-Object.defineProperty(exports, "SequenceField", {
-  enumerable: true,
-  get: function get() {
-    return _sequenceField.SequenceField;
-  }
-});
 
 var _arrayField = require("./array-field");
 
 Object.keys(_arrayField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _arrayField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -27,11 +17,23 @@ Object.keys(_arrayField).forEach(function (key) {
   });
 });
 
+var _setField = require("./set-field");
+
+Object.keys(_setField).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _setField[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _setField[key];
+    }
+  });
+});
+
 var _belongsToField = require("./belongs-to-field");
 
 Object.keys(_belongsToField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _belongsToField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -45,7 +47,6 @@ var _belongsToManyField = require("./belongs-to-many-field");
 
 Object.keys(_belongsToManyField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _belongsToManyField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -59,7 +60,6 @@ var _booleanField = require("./boolean-field");
 
 Object.keys(_booleanField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _booleanField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -73,7 +73,6 @@ var _contextField = require("./context-field");
 
 Object.keys(_contextField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _contextField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -87,7 +86,6 @@ var _dateField = require("./date-field");
 
 Object.keys(_dateField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _dateField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -101,7 +99,6 @@ var _field = require("./field");
 
 Object.keys(_field).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _field[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -115,7 +112,6 @@ var _hasManyField = require("./has-many-field");
 
 Object.keys(_hasManyField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _hasManyField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -129,7 +125,6 @@ var _hasOneField = require("./has-one-field");
 
 Object.keys(_hasOneField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _hasOneField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -143,7 +138,6 @@ var _jsonField = require("./json-field");
 
 Object.keys(_jsonField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _jsonField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -157,7 +151,6 @@ var _numberField = require("./number-field");
 
 Object.keys(_numberField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _numberField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -171,7 +164,6 @@ var _passwordField = require("./password-field");
 
 Object.keys(_passwordField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _passwordField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -185,7 +177,6 @@ var _radioField = require("./radio-field");
 
 Object.keys(_radioField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _radioField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -199,7 +190,6 @@ var _relationField = require("./relation-field");
 
 Object.keys(_relationField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _relationField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -213,7 +203,6 @@ var _sortField = require("./sort-field");
 
 Object.keys(_sortField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _sortField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -227,7 +216,6 @@ var _stringField = require("./string-field");
 
 Object.keys(_stringField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _stringField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -241,7 +229,6 @@ var _textField = require("./text-field");
 
 Object.keys(_textField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _textField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -255,7 +242,6 @@ var _timeField = require("./time-field");
 
 Object.keys(_timeField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _timeField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -269,7 +255,6 @@ var _uidField = require("./uid-field");
 
 Object.keys(_uidField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _uidField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -283,7 +268,6 @@ var _uuidField = require("./uuid-field");
 
 Object.keys(_uuidField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _uuidField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -297,7 +281,6 @@ var _virtualField = require("./virtual-field");
 
 Object.keys(_virtualField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _virtualField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -311,7 +294,6 @@ var _formulaField = require("./formula-field");
 
 Object.keys(_formulaField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _formulaField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -319,6 +301,4 @@ Object.keys(_formulaField).forEach(function (key) {
       return _formulaField[key];
     }
   });
-});
-
-var _sequenceField = require("./sequence-field");
+});

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

@@ -16,5 +16,6 @@ export declare abstract class RelationField extends Field {
      * get target model from database by it's name
      * @constructor
      */
-    get TargetModel(): import("sequelize/types").ModelCtor<import("sequelize/types").Model<any, any>>;
+    get TargetModel(): import("sequelize").ModelCtor<import("sequelize").Model<any, any>>;
+    protected clearAccessors(): void;
 }

package/lib/fields/relation-field.js

@@ -39,6 +39,22 @@ class RelationField extends _field.Field {
     return this.context.database.sequelize.models[this.target];
   }
 
+  clearAccessors() {
+    const collection = this.context.collection;
+    const association = collection.model.associations[this.name];
+
+    if (!association) {
+      return;
+    } // @ts-ignore
+
+
+    const accessors = Object.values(association.accessors);
+    accessors.forEach(accessor => {
+      // @ts-ignore
+      delete collection.model.prototype[accessor];
+    });
+  }
+
 }
 
 exports.RelationField = RelationField;

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

@@ -0,0 +1,10 @@
+import { ArrayField } from './array-field';
+import { BaseColumnFieldOptions } from './field';
+export interface SetFieldOptions extends BaseColumnFieldOptions {
+    type: 'set';
+}
+export declare class SetField extends ArrayField {
+    beforeSave: (model: any) => void;
+    bind(): void;
+    unbind(): void;
+}

package/lib/fields/set-field.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SetField = void 0;
+
+var _arrayField = require("./array-field");
+
+class SetField extends _arrayField.ArrayField {
+  constructor(...args) {
+    super(...args);
+
+    this.beforeSave = model => {
+      const oldValue = model.get(this.options.name);
+
+      if (oldValue) {
+        model.set(this.options.name, [...new Set(oldValue)]);
+      }
+    };
+  }
+
+  bind() {
+    super.bind();
+    this.on('beforeSave', this.beforeSave);
+  }
+
+  unbind() {
+    super.unbind();
+    this.off('beforeSave', this.beforeSave);
+  }
+
+}
+
+exports.SetField = SetField;

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

@@ -1,7 +1,7 @@
 import { DataTypes } from 'sequelize';
 import { BaseColumnFieldOptions, Field } from './field';
 export declare class SortField extends Field {
-    get dataType(): DataTypes.IntegerDataTypeConstructor;
+    get dataType(): DataTypes.BigIntDataTypeConstructor;
     setSortValue: (instance: any, options: any) => Promise<void>;
     onScopeChange: (instance: any, options: any) => Promise<void>;
     initRecordsSortValue: ({ transaction }: {

package/lib/fields/sort-field.js

@@ -161,7 +161,7 @@ class SortField extends _field.Field {
   }
 
   get dataType() {
-    return _sequelize().DataTypes.INTEGER;
+    return _sequelize().DataTypes.BIGINT;
   }
 
   bind() {

package/lib/filter-match.d.ts

@@ -0,0 +1 @@
+export declare function filterMatch(model: any, where: any): boolean;

package/lib/filter-match.js

@@ -0,0 +1,84 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.filterMatch = filterMatch;
+
+function _mathjs() {
+  const data = require("mathjs");
+
+  _mathjs = function _mathjs() {
+    return data;
+  };
+
+  return data;
+}
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function filterMatch(model, where) {
+  if (where.filter !== undefined) {
+    where = _mathjs().filter;
+  } // Create an object that maps operator names to functions
+
+
+  const operatorFunctions = {
+    $eq: (value, condition) => value === condition,
+    $not: (value, condition) => !filterMatch(model, condition),
+    $gt: (value, condition) => value > condition,
+    $gte: (value, condition) => value >= condition,
+    $lt: (value, condition) => value < condition,
+    $lte: (value, condition) => value <= condition,
+    $ne: (value, condition) => value !== condition,
+    $in: (value, condition) => condition.includes(value),
+    $or: (model, conditions) => Object.values(conditions).some(condition => filterMatch(model, condition)),
+    $and: (model, conditions) => Object.values(conditions).every(condition => filterMatch(model, condition))
+  };
+
+  for (var _i = 0, _Object$entries = Object.entries(where); _i < _Object$entries.length; _i++) {
+    const _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+          key = _Object$entries$_i[0],
+          value = _Object$entries$_i[1];
+
+    // Check if the property value contains a logical operator
+    if (operatorFunctions[key] !== undefined) {
+      // Check if the conditions specified in the property value are satisfied
+      if (!operatorFunctions[key](model, value)) {
+        return false;
+      }
+    } else {
+      // Check if the property value is an object (which would contain operators)
+      if (typeof value === 'object') {
+        // Loop through each operator in the property value
+        for (var _i2 = 0, _Object$entries2 = Object.entries(value); _i2 < _Object$entries2.length; _i2++) {
+          const _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
+                operator = _Object$entries2$_i[0],
+                condition = _Object$entries2$_i[1];
+
+          // Check if the property value satisfies the condition
+          if (!operatorFunctions[operator](model[key], condition)) {
+            return false;
+          }
+        }
+      } else {
+        // Assume the default operator is "eq"
+        if (!operatorFunctions['$eq'](model[key], value)) {
+          return false;
+        }
+      }
+    }
+  }
+
+  return true;
+}

package/lib/filter-parser.d.ts

@@ -1,4 +1,4 @@
-import { ModelCtor } from 'sequelize';
+import { ModelStatic } from 'sequelize';
 import { Collection } from './collection';
 import { Database } from './database';
 import { Model } from './model';
@@ -10,7 +10,7 @@ interface FilterParserContext {
 export default class FilterParser {
     collection: Collection;
     database: Database;
-    model: ModelCtor<Model>;
+    model: ModelStatic<Model>;
     filter: FilterType;
     context: FilterParserContext;
     constructor(filter: FilterType, context: FilterParserContext);

package/lib/index.d.ts

@@ -1,5 +1,6 @@
-export { DataTypes, ModelCtor, Op, SyncOptions } from 'sequelize';
+export { DataTypes, ModelStatic, Op, SyncOptions } from 'sequelize';
 export * from './collection';
+export * from './inherited-collection';
 export * from './database';
 export { Database as default } from './database';
 export * from './fields';
@@ -14,3 +15,6 @@ export * from './relation-repository/multiple-relation-repository';
 export * from './relation-repository/single-relation-repository';
 export * from './repository';
 export * from './update-associations';
+export * from './collection-importer';
+export * from './filter-match';
+export * from './field-repository/array-field-repository';

package/lib/index.js

@@ -50,6 +50,20 @@ Object.keys(_collection).forEach(function (key) {
   });
 });
 
+var _inheritedCollection = require("./inherited-collection");
+
+Object.keys(_inheritedCollection).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _inheritedCollection[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _inheritedCollection[key];
+    }
+  });
+});
+
 var _database = require("./database");
 
 Object.keys(_database).forEach(function (key) {
@@ -230,4 +244,46 @@ Object.keys(_updateAssociations).forEach(function (key) {
       return _updateAssociations[key];
     }
   });
+});
+
+var _collectionImporter = require("./collection-importer");
+
+Object.keys(_collectionImporter).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _collectionImporter[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _collectionImporter[key];
+    }
+  });
+});
+
+var _filterMatch = require("./filter-match");
+
+Object.keys(_filterMatch).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _filterMatch[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _filterMatch[key];
+    }
+  });
+});
+
+var _arrayFieldRepository = require("./field-repository/array-field-repository");
+
+Object.keys(_arrayFieldRepository).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _arrayFieldRepository[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _arrayFieldRepository[key];
+    }
+  });
 });

package/lib/inherited-collection.d.ts

@@ -0,0 +1,13 @@
+import { Collection, CollectionContext, CollectionOptions } from './collection';
+import { Field } from '.';
+export declare class InheritedCollection extends Collection {
+    parents?: Collection[];
+    constructor(options: CollectionOptions, context: CollectionContext);
+    protected bindParents(): void;
+    protected setParents(inherits: string | string[]): void;
+    protected setParentFields(): void;
+    getParents(): Collection<any, any>[];
+    parentFields(): Map<string, Field>;
+    parentAttributes(): {};
+    isInherited(): boolean;
+}