@nocobase/database 1.3.38-beta → 1.4.0-alpha

package/lib/relation-repository/relation-repository.js

@@ -73,13 +73,27 @@ const _RelationRepository = class _RelationRepository {
     this.db = sourceCollection.context.database;
     this.database = this.db;
     this.sourceCollection = sourceCollection;
-    this.sourceKeyValue = sourceKeyValue;
+    this.setSourceKeyValue(sourceKeyValue);
     this.associationName = association;
     this.association = this.sourceCollection.model.associations[association];
     this.associationField = this.sourceCollection.getField(association);
     this.targetModel = this.association.target;
     this.targetCollection = this.sourceCollection.context.database.modelCollection.get(this.targetModel);
   }
+  decodeMultiTargetKey(str) {
+    try {
+      const decoded = decodeURIComponent(str);
+      return JSON.parse(decoded);
+    } catch (e) {
+      return false;
+    }
+  }
+  setSourceKeyValue(sourceKeyValue) {
+    this.sourceKeyValue = typeof sourceKeyValue === "string" ? this.decodeMultiTargetKey(sourceKeyValue) || sourceKeyValue : sourceKeyValue;
+  }
+  isMultiTargetKey(value) {
+    return import_lodash.default.isPlainObject(value || this.sourceKeyValue);
+  }
   get collection() {
     return this.db.getCollection(this.targetModel.name);
   }
@@ -109,7 +123,7 @@ const _RelationRepository = class _RelationRepository {
   }
   convertTk(options) {
     let tk = options;
-    if (typeof options === "object" && options["tk"]) {
+    if (typeof options === "object" && "tk" in options) {
       tk = options["tk"];
     }
     return tk;
@@ -119,7 +133,10 @@ const _RelationRepository = class _RelationRepository {
     if (typeof tk === "string") {
       tk = tk.split(",");
     }
-    return import_lodash.default.castArray(tk);
+    if (tk) {
+      return import_lodash.default.castArray(tk);
+    }
+    return [];
   }
   targetKey() {
     return this.associationField.targetKey;
@@ -147,7 +164,13 @@ const _RelationRepository = class _RelationRepository {
   }
   async getSourceModel(transaction2) {
     if (!this.sourceInstance) {
-      this.sourceInstance = await this.sourceCollection.model.findOne({
+      this.sourceInstance = this.isMultiTargetKey() ? await this.sourceCollection.repository.findOne({
+        filter: {
+          // @ts-ignore
+          ...this.sourceKeyValue
+        },
+        transaction: transaction2
+      }) : await this.sourceCollection.model.findOne({
         where: {
           [this.associationField.sourceKey]: this.sourceKeyValue
         },

package/lib/repository.d.ts

@@ -26,7 +26,9 @@ export { Transactionable } from 'sequelize';
 export interface FilterAble {
     filter: Filter;
 }
-export type TargetKey = string | number;
+export type BaseTargetKey = string | number;
+export type MultiTargetKey = Record<string, BaseTargetKey>;
+export type TargetKey = BaseTargetKey | MultiTargetKey;
 export type TK = TargetKey | TargetKey[];
 type FieldValue = string | number | bigint | boolean | Date | Buffer | null | FieldValue[] | FilterWithOperator;
 type Operators = keyof typeof operators & keyof WhereOperators;
@@ -116,7 +118,7 @@ declare class RelationRepositoryBuilder<R extends RelationRepository> {
         BelongsToArray: typeof BelongsToArrayRepository;
     };
     constructor(collection: Collection, associationName: string);
-    of(id: string | number): R;
+    of(id: TargetKey): R;
     protected builder(): {
         HasOne: typeof HasOneRepository;
         BelongsTo: typeof BelongsToRepository;
@@ -171,6 +173,7 @@ export declare class Repository<TModelAttributes extends {} = any, TCreationAttr
      *
      */
     findById(id: string | number): Promise<Model<any, any>>;
+    findByTargetKey(targetKey: TargetKey): Promise<any>;
     /**
      * Find one record from database
      *

package/lib/repository.js

@@ -175,27 +175,24 @@ const _Repository = class _Repository {
       };
     }
     if (countOptions == null ? void 0 : countOptions.filterByTk) {
+      const optionParser = new import_options_parser.OptionsParser(options, {
+        collection: this.collection
+      });
       options["where"] = {
-        [import_sequelize.Op.and]: [
-          options["where"] || {},
-          {
-            [this.collection.filterTargetKey]: options.filterByTk
-          }
-        ]
+        [import_sequelize.Op.and]: [options["where"] || {}, optionParser.filterByTkToWhereOption()]
       };
     }
     const queryOptions = {
       ...options,
-      distinct: Boolean(this.collection.model.primaryKeyAttribute)
+      distinct: Boolean(this.collection.model.primaryKeyAttribute) && !this.collection.isMultiFilterTargetKey()
     };
     if (((_a = queryOptions.include) == null ? void 0 : _a.length) === 0) {
       delete queryOptions.include;
     }
-    const count = await this.collection.model.count({
+    return await this.collection.model.count({
       ...queryOptions,
       transaction: transaction2
     });
-    return count;
   }
   async aggregate(options) {
     var _a;
@@ -325,6 +322,9 @@ const _Repository = class _Repository {
   findById(id) {
     return this.collection.model.findByPk(id);
   }
+  findByTargetKey(targetKey) {
+    return this.findOne({ filterByTk: targetKey });
+  }
   /**
    * Find one record from database
    *
@@ -374,7 +374,7 @@ const _Repository = class _Repository {
       action: "create",
       underscored: this.collection.options.underscored
     });
-    const values = guard.sanitize(options.values || {});
+    const values = this.model.callSetters(guard.sanitize(options.values || {}), options);
     const instance = await this.model.create(values, {
       ...options,
       transaction: transaction2
@@ -418,7 +418,7 @@ const _Repository = class _Repository {
     }
     const transaction2 = await this.getTransaction(options);
     const guard = import_update_guard.UpdateGuard.fromOptions(this.model, { ...options, underscored: this.collection.options.underscored });
-    const values = guard.sanitize(options.values);
+    const values = this.model.callSetters(guard.sanitize(options.values || {}), options);
     if (options.individualHooks === false) {
       const { model: Model2 } = this.collection;
       const primaryKeyField = Model2.primaryKeyField || Model2.primaryKeyAttribute;
@@ -501,15 +501,26 @@ const _Repository = class _Repository {
       }
     }
     if (filterByTk && !options.filter) {
-      return await this.model.destroy({
+      const where = [];
+      for (const tk of filterByTk) {
+        const optionParser = new import_options_parser.OptionsParser(
+          {
+            filterByTk: tk
+          },
+          {
+            collection: this.collection
+          }
+        );
+        where.push(optionParser.filterByTkToWhereOption());
+      }
+      const destroyOptions = {
         ...options,
         where: {
-          [modelFilterKey]: {
-            [import_sequelize.Op.in]: filterByTk
-          }
+          [import_sequelize.Op.or]: where
         },
         transaction: transaction2
-      });
+      };
+      return await this.model.destroy(destroyOptions);
     }
     if (options.filter && (0, import_utils.isValidFilter)(options.filter)) {
       if (this.collection.model.primaryKeyAttributes.length !== 1 && !import_lodash.default.get(this.collection.options, "filterTargetKey")) {

package/lib/update-associations.d.ts

@@ -8,6 +8,7 @@
  */
 import { Association, BelongsToMany, Hookable, Transactionable } from 'sequelize';
 import { Model } from './model';
+import { TargetKey } from './repository';
 export declare function modelAssociations(instance: Model): {
     [key: string]: Association<import("sequelize").Model<any, any>, import("sequelize").Model<any, any>>;
 };
@@ -18,7 +19,7 @@ type UpdateValue = {
 };
 interface UpdateOptions extends Transactionable {
     filter?: any;
-    filterByTk?: number | string;
+    filterByTk?: TargetKey;
     whitelist?: string[];
     blacklist?: string[];
     updateAssociationValues?: string[];

package/lib/view/field-type-map.d.ts

@@ -62,7 +62,7 @@ declare const fieldTypeMap: {
         boolean: string;
         decimal: string;
         year: string[];
-        datetime: string;
+        datetime: string[];
         timestamp: string;
         json: string[];
         enum: string;
@@ -104,7 +104,7 @@ declare const fieldTypeMap: {
         boolean: string;
         decimal: string;
         year: string[];
-        datetime: string;
+        datetime: string[];
         timestamp: string;
         json: string[];
         enum: string;

package/lib/view/field-type-map.js

@@ -30,24 +30,24 @@ __export(field_type_map_exports, {
 });
 module.exports = __toCommonJS(field_type_map_exports);
 const postgres = {
-  "character varying": ["string", "uuid", "nanoid", "encryption"],
-  varchar: ["string", "uuid", "nanoid", "encryption"],
-  char: ["string", "uuid", "nanoid", "encryption"],
+  "character varying": ["string", "uuid", "nanoid", "encryption", "datetimeNoTz"],
+  varchar: ["string", "uuid", "nanoid", "encryption", "datetimeNoTz"],
+  char: ["string", "uuid", "nanoid", "encryption", "datetimeNoTz"],
   character: "string",
   text: "text",
   oid: "string",
   name: "string",
   smallint: ["integer", "sort"],
-  integer: ["integer", "sort"],
-  bigint: ["bigInt", "sort"],
+  integer: ["integer", "unixTimestamp", "sort"],
+  bigint: ["bigInt", "unixTimestamp", "sort"],
   decimal: "decimal",
   numeric: "float",
   real: "float",
   "double precision": "float",
-  "timestamp without time zone": "date",
-  "timestamp with time zone": "date",
+  "timestamp without time zone": "datetimeNoTz",
+  "timestamp with time zone": "datetimeTz",
   "time without time zone": "time",
-  date: "date",
+  date: "dateOnly",
   boolean: "boolean",
   json: ["json", "array"],
   jsonb: ["json", "array", "jsonb"],
@@ -68,24 +68,24 @@ const mysql = {
   "mediumint unsigned": ["integer", "boolean", "sort"],
   char: ["string", "uuid", "nanoid", "encryption"],
   varchar: ["string", "uuid", "nanoid", "encryption"],
-  date: "date",
+  date: "dateOnly",
   time: "time",
   tinytext: "text",
   text: "text",
   mediumtext: "text",
   longtext: "text",
-  int: ["integer", "sort"],
-  "int unsigned": ["integer", "sort"],
-  integer: ["integer", "sort"],
-  bigint: ["bigInt", "sort"],
-  "bigint unsigned": ["bigInt", "sort"],
+  int: ["integer", "unixTimestamp", "sort"],
+  "int unsigned": ["integer", "unixTimestamp", "sort"],
+  integer: ["integer", "unixTimestamp", "sort"],
+  bigint: ["bigInt", "unixTimestamp", "sort"],
+  "bigint unsigned": ["bigInt", "unixTimestamp", "sort"],
   float: "float",
   double: "float",
   boolean: "boolean",
   decimal: "decimal",
   year: ["string", "integer"],
-  datetime: "date",
-  timestamp: "date",
+  datetime: ["datetimeNoTz", "datetimeTz"],
+  timestamp: "datetimeTz",
   json: ["json", "array"],
   enum: "string"
 };
@@ -94,7 +94,7 @@ const sqlite = {
   varchar: ["string", "uuid", "nanoid", "encryption"],
   integer: "integer",
   real: "real",
-  datetime: "date",
+  datetime: "datetimeTz",
   date: "date",
   time: "time",
   boolean: "boolean",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.3.38-beta",
+  "version": "1.4.0-alpha",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.3.38-beta",
-    "@nocobase/utils": "1.3.38-beta",
+    "@nocobase/logger": "1.4.0-alpha",
+    "@nocobase/utils": "1.4.0-alpha",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "1b9490667c9224cd0b179cbf75e10a581c49b230"
+  "gitHead": "f097a2bddec152522b5645bd5d451f4c866d2060"
 }