@domain.js/main 0.4.16 → 0.4.17

package/dist/deps/rest/utils.d.ts

@@ -1,7 +1,6 @@
 import type { LoDashStatic } from "lodash";
 import moment from "moment";
 import * as mysql from "mysql2";
-import * as Sequelize from "sequelize";
 import { ModelBase, ModelStatic } from "../sequelize";
 interface Cnf {
     rest: {
@@ -12,7 +11,6 @@ interface Deps {
     _: LoDashStatic;
     mysql: Pick<typeof mysql, "escape">;
     moment: typeof moment extends (...args: infer A) => infer B ? (...args: A) => B : never;
-    Sequelize: Pick<typeof Sequelize, "where" | "fn" | "col" | "literal" | "Op">;
     errors: {
         notAllowed: (...args: any[]) => Error;
         resourceDuplicateAdd: (...args: any[]) => Error;

package/dist/deps/rest/utils.js

@@ -21,9 +21,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utils = void 0;
 const mysql = __importStar(require("mysql2"));
+const sequelize_1 = require("sequelize");
 function Utils(cnf, deps) {
     const { rest: { relativeMaxRangeDays: RELATIVE_MAX_RANGE = 100 }, } = cnf;
-    const { _, errors, moment, Sequelize } = deps;
+    const { _, errors, moment } = deps;
     /**
      * 相对多少天的时间
      * @param Number days 相对多少天
@@ -202,7 +203,7 @@ function Utils(cnf, deps) {
     const RELATIVE_RANGE_ERROR = errors.notAllowed(`相对时间跨度最多 ${RELATIVE_MAX_RANGE} 天`);
     // findOptFilter 的处理
     // eslint-disable-next-line complexity
-    const findOptFilter = (params, name, where, Op, col = name) => {
+    const findOptFilter = (params, name, where, col = name) => {
         let value;
         if (!params)
             return;
@@ -218,27 +219,27 @@ function Utils(cnf, deps) {
                 throw RELATIVE_RANGE_ERROR;
             if (!where[col])
                 where[col] = {};
-            if (!where[col][Op.and])
-                where[col][Op.and] = [];
+            if (!where[col][sequelize_1.Op.and])
+                where[col][sequelize_1.Op.and] = [];
             if (ignoreYear) {
                 // 忽略年，这里要处理跨年的问题
                 const startDate = moment(Date.now() + start * 86400000).format("MM-DD");
                 const endDate = moment(Date.now() + end * 86400000).format("MM-DD");
                 if (endDate < startDate) {
-                    where[col][Op.and].push({
-                        [Op.or]: [
-                            Sequelize.where(Sequelize.fn("DATE_FORMAT", Sequelize.col(name), "%m-%d"), Op.between, Sequelize.literal(`'${startDate}' AND '12-31'`)),
-                            Sequelize.where(Sequelize.fn("DATE_FORMAT", Sequelize.col(name), "%m-%d"), Op.between, Sequelize.literal(`'01-01' AND '${endDate}'`)),
+                    where[col][sequelize_1.Op.and].push({
+                        [sequelize_1.Op.or]: [
+                            sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("DATE_FORMAT", sequelize_1.Sequelize.col(name), "%m-%d"), sequelize_1.Op.between, sequelize_1.Sequelize.literal(`'${startDate}' AND '12-31'`)),
+                            sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("DATE_FORMAT", sequelize_1.Sequelize.col(name), "%m-%d"), sequelize_1.Op.between, sequelize_1.Sequelize.literal(`'01-01' AND '${endDate}'`)),
                         ],
                     });
                 }
                 else {
-                    where[col][Op.and].push(Sequelize.where(Sequelize.fn("DATE_FORMAT", Sequelize.col(name), "%m-%d"), Op.between, Sequelize.literal(`'${startDate}' AND '${endDate}'`)));
+                    where[col][sequelize_1.Op.and].push(sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("DATE_FORMAT", sequelize_1.Sequelize.col(name), "%m-%d"), sequelize_1.Op.between, sequelize_1.Sequelize.literal(`'${startDate}' AND '${endDate}'`)));
                 }
             }
             else {
-                where[col][Op.and].push(Sequelize.where(Sequelize.fn("DATE", Sequelize.col(name)), {
-                    [Op.between]: [relativeDays(start), relativeDays(end, false)],
+                where[col][sequelize_1.Op.and].push(sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("DATE", sequelize_1.Sequelize.col(name)), {
+                    [sequelize_1.Op.between]: [relativeDays(start), relativeDays(end, false)],
                 }));
             }
         }
@@ -250,36 +251,36 @@ function Utils(cnf, deps) {
                 value = null;
             if (!where[col])
                 where[col] = {};
-            where[col][Op.eq] = value;
+            where[col][sequelize_1.Op.eq] = value;
         }
         if (_.isNumber(params[name])) {
             if (!where[col])
                 where[col] = {};
-            where[col][Op.eq] = params[name];
+            where[col][sequelize_1.Op.eq] = params[name];
         }
         // 处理where in
         if (_.isString(params[`${name}s`])) {
             if (!where[col])
                 where[col] = {};
-            where[col][Op.in] = params[`${name}s`].trim().split(",");
+            where[col][sequelize_1.Op.in] = params[`${name}s`].trim().split(",");
         }
         // in 直接是数组的格式
         if (_.isArray(params[`${name}s`])) {
             if (!where[col])
                 where[col] = {};
-            where[col][Op.in] = params[`${name}s`];
+            where[col][sequelize_1.Op.in] = params[`${name}s`];
         }
         // 处理where not in
         if (_.isString(params[`${name}s!`])) {
             if (!where[col])
                 where[col] = {};
-            where[col][Op.notIn] = params[`${name}s!`].trim().split(",");
+            where[col][sequelize_1.Op.notIn] = params[`${name}s!`].trim().split(",");
         }
         // not in 直接是数组的格式
         if (_.isArray(params[`${name}s!`])) {
             if (!where[col])
                 where[col] = {};
-            where[col][Op.notIn] = params[`${name}s!`];
+            where[col][sequelize_1.Op.notIn] = params[`${name}s!`];
         }
         // 处理不等于的判断
         if (_.isString(params[`${name}!`])) {
@@ -289,10 +290,10 @@ function Utils(cnf, deps) {
             // 特殊处理null值
             if (value === ".null.") {
                 value = null;
-                where[col][Op.not] = value;
+                where[col][sequelize_1.Op.not] = value;
             }
             else {
-                where[col][Op.ne] = value;
+                where[col][sequelize_1.Op.ne] = value;
             }
         }
         // 处理like
@@ -300,16 +301,16 @@ function Utils(cnf, deps) {
             value = params[`${name}_like`].trim().replace(/\*/g, "%");
             if (!where[col])
                 where[col] = {};
-            where[col][Op.like] = value;
+            where[col][sequelize_1.Op.like] = value;
         }
         // 处理likes [like or]
         if (_.isString(params[`${name}_likes`])) {
             const likes = params[`${name}_likes`].trim().split(",");
             if (!where[col])
                 where[col] = {};
-            where[col][Op.or] = likes.map((x) => {
+            where[col][sequelize_1.Op.or] = likes.map((x) => {
                 value = x.trim().replace(/\*/g, "%");
-                return { [Op.like]: value };
+                return { [sequelize_1.Op.like]: value };
             });
         }
         // 处理notLike
@@ -317,7 +318,7 @@ function Utils(cnf, deps) {
             value = params[`${name}_notLike`].trim().replace(/\*/g, "%");
             if (!where[col])
                 where[col] = {};
-            where[col][Op.notLike] = value;
+            where[col][sequelize_1.Op.notLike] = value;
         }
         // 处理大于，小于, 大于等于，小于等于的判断
         _.each(["gt", "gte", "lt", "lte"], (x) => {
@@ -327,48 +328,46 @@ function Utils(cnf, deps) {
             value = _.isString(params[c]) ? params[c].trim() : params[c];
             if (!where[col])
                 where[col] = {};
-            where[col][Op[x]] = value;
+            where[col][sequelize_1.Op[x]] = value;
         });
         // 处理 find_in_set 方式的过滤
         if (_.isString(params[`${name}_ins`]) || _.isNumber(params[`${name}_ins`])) {
-            if (!where[Op.and])
-                where[Op.and] = [];
-            where[Op.and].push(Sequelize.where(Sequelize.fn("FIND_IN_SET", params[`${name}_ins`], Sequelize.col(name)), Op.gte, 1));
+            if (!where[sequelize_1.Op.and])
+                where[sequelize_1.Op.and] = [];
+            where[sequelize_1.Op.and].push(sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("FIND_IN_SET", params[`${name}_ins`], sequelize_1.Sequelize.col(name)), sequelize_1.Op.gte, 1));
         }
         // 处理 find_in_set 方式的过滤 _ins_and
         if (_.isString(params[`${name}_ins_and`])) {
-            if (!where[Op.and])
-                where[Op.and] = [];
+            if (!where[sequelize_1.Op.and])
+                where[sequelize_1.Op.and] = [];
             for (const v of params[`${name}_ins_and`].split(",")) {
-                where[Op.and].push(Sequelize.where(Sequelize.fn("FIND_IN_SET", v.trim(), Sequelize.col(name)), Op.gte, 1));
+                where[sequelize_1.Op.and].push(sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("FIND_IN_SET", v.trim(), sequelize_1.Sequelize.col(name)), sequelize_1.Op.gte, 1));
             }
         }
         // 处理 find_in_set 方式的过滤 _ins_or
         if (_.isString(params[`${name}_ins_or`])) {
-            if (!where[Op.and])
-                where[Op.and] = [];
-            where[Op.and].push({
-                [Op.or]: params[`${name}_ins_or`].split(",").map((v) => Sequelize.where(Sequelize.fn("FIND_IN_SET", v.trim(), Sequelize.col(name)), Op.gte, 1)),
+            if (!where[sequelize_1.Op.and])
+                where[sequelize_1.Op.and] = [];
+            where[sequelize_1.Op.and].push({
+                [sequelize_1.Op.or]: params[`${name}_ins_or`].split(",").map((v) => sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("FIND_IN_SET", v.trim(), sequelize_1.Sequelize.col(name)), sequelize_1.Op.gte, 1)),
             });
         }
         // 处理 find_in_set 方式的过滤 _ins_not
         if (_.isString(params[`${name}_ins_not`])) {
-            if (!where[Op.and])
-                where[Op.and] = [];
+            if (!where[sequelize_1.Op.and])
+                where[sequelize_1.Op.and] = [];
             for (const v of params[`${name}_ins_not`].split(",")) {
-                where[Op.and].push(Sequelize.where(Sequelize.fn("FIND_IN_SET", v.trim(), Sequelize.col(name)), Op.lt, 1));
+                where[sequelize_1.Op.and].push(sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("FIND_IN_SET", v.trim(), sequelize_1.Sequelize.col(name)), sequelize_1.Op.lt, 1));
             }
         }
     };
     // 返回列表查询的条件
     const findAllOpts = (Model, params) => {
-        const { Op } = Sequelize;
-        const { literal } = Model.sequelize;
         const where = {};
         const searchOrs = [];
         const includes = modelInclude(params, Model.includes);
         _.each(Model.filterAttrs || _.keys(Model.rawAttributes), (name) => {
-            findOptFilter(params, name, where, Op);
+            findOptFilter(params, name, where);
         });
         if (Model.rawAttributes.isDeleted && !params._showDeleted) {
             where.isDeleted = "no";
@@ -384,12 +383,12 @@ function Utils(cnf, deps) {
                 const includeWhere = {};
                 const filterAttrs = x.model.filterAttrs || _.keys(x.model.rawAttributes);
                 _.each(filterAttrs, (name) => {
-                    findOptFilter(params, `${x.as}.${name}`, includeWhere, Op, name);
+                    findOptFilter(params, `${x.as}.${name}`, includeWhere, name);
                 });
                 if (x.model.rawAttributes.isDeleted && !params._showDeleted) {
-                    includeWhere[Op.or] = [{ isDeleted: "no" }];
+                    includeWhere[sequelize_1.Op.or] = [{ isDeleted: "no" }];
                     if (x.required === false)
-                        includeWhere[Op.or].push({ id: null });
+                        includeWhere[sequelize_1.Op.or].push({ id: null });
                 }
                 // 将搜索条件添加到 include 的 where 条件上
                 const searchOptResII = searchOpt(x.model, params._searchs, params.q, x.as);
@@ -411,14 +410,14 @@ function Utils(cnf, deps) {
         const _searchOrs = _.filter(_.compact(searchOrs), (x) => x.length);
         if (_.size(where)) {
             if (_searchOrs.length) {
-                ret.where = Sequelize.and(where, literal(mergeSearchOrs(_searchOrs)));
+                ret.where = sequelize_1.Sequelize.and(where, (0, sequelize_1.literal)(mergeSearchOrs(_searchOrs)));
             }
             else {
                 ret.where = where;
             }
         }
         else if (_searchOrs.length) {
-            ret.where = literal(mergeSearchOrs(_searchOrs));
+            ret.where = (0, sequelize_1.literal)(mergeSearchOrs(_searchOrs));
         }
         // 处理需要返回的字段
         (() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "0.4.16",
+  "version": "0.4.17",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {