@domain.js/main 0.4.24 → 0.5.2

package/dist/deps/rest/utils.js

@@ -203,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, col = name) => {
+    const findOptFilter = (params, name, where, modelAlias4Ins, col = name) => {
         let value;
         if (!params)
             return;
@@ -334,14 +334,14 @@ function Utils(cnf, deps) {
         if (_.isString(params[`${name}_ins`]) || _.isNumber(params[`${name}_ins`])) {
             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));
+            where[sequelize_1.Op.and].push(sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("FIND_IN_SET", params[`${name}_ins`], sequelize_1.Sequelize.col(`${modelAlias4Ins}.${col}`)), sequelize_1.Op.gte, 1));
         }
         // 处理 find_in_set 方式的过滤 _ins_and
         if (_.isString(params[`${name}_ins_and`])) {
             if (!where[sequelize_1.Op.and])
                 where[sequelize_1.Op.and] = [];
             for (const v of params[`${name}_ins_and`].split(",")) {
-                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));
+                where[sequelize_1.Op.and].push(sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("FIND_IN_SET", v.trim(), sequelize_1.Sequelize.col(`${modelAlias4Ins}.${col}`)), sequelize_1.Op.gte, 1));
             }
         }
         // 处理 find_in_set 方式的过滤 _ins_or
@@ -349,7 +349,7 @@ function Utils(cnf, deps) {
             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)),
+                [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(`${modelAlias4Ins}.${col}`)), sequelize_1.Op.gte, 1)),
             });
         }
         // 处理 find_in_set 方式的过滤 _ins_not
@@ -357,7 +357,7 @@ function Utils(cnf, deps) {
             if (!where[sequelize_1.Op.and])
                 where[sequelize_1.Op.and] = [];
             for (const v of params[`${name}_ins_not`].split(",")) {
-                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));
+                where[sequelize_1.Op.and].push(sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("FIND_IN_SET", v.trim(), sequelize_1.Sequelize.col(`${modelAlias4Ins}.${col}`)), sequelize_1.Op.lt, 1));
             }
         }
     };
@@ -367,7 +367,7 @@ function Utils(cnf, deps) {
         const searchOrs = [];
         const includes = modelInclude(params, Model.includes);
         _.each(Model.filterAttrs || _.keys(Model.rawAttributes), (name) => {
-            findOptFilter(params, name, where);
+            findOptFilter(params, name, where, Model.name);
         });
         if (!params._showDeleted) {
             if (Model.rawAttributes.isDeleted)
@@ -384,7 +384,7 @@ function Utils(cnf, deps) {
                 const includeWhere = {};
                 const filterAttrs = x.model.filterAttrs || _.keys(x.model.rawAttributes);
                 _.each(filterAttrs, (name) => {
-                    findOptFilter(params, `${x.as}.${name}`, includeWhere, name);
+                    findOptFilter(params, `${x.as}.${name}`, includeWhere, x.as, name);
                 });
                 if (!params._showDeleted) {
                     if (x.model.rawAttributes.isDeleted) {

package/dist/http/socket.d.ts

@@ -13,6 +13,7 @@ export declare type Client = Socket<DefaultEventsMap, DefaultEventsMap, DefaultE
     operator?: any;
     /** 退出房间回调函数 */
     quit?: Function;
+    entranceOpts?: any[];
 };
 declare const makeProfile: (client: Client, type: string | undefined, auth: string | Signature, extra?: Profile["extra"]) => Profile;
 export declare function BridgeSocket(io: Server, domain: Domain): void;

package/dist/http/socket.js

@@ -109,10 +109,12 @@ function BridgeSocket(io, domain) {
                 console.error(e);
             }
         });
-        client.on("entrance", async (roomId) => {
+        client.on("entrance", async (roomId, ...opts) => {
             try {
                 if (!client.profile || !client.inited)
                     return;
+                if (opts.length)
+                    Object.assign(client, { entranceOpts: opts });
                 const ret = await entrance({ ...client.profile, roomId }, client);
                 client.profile.roomId = roomId;
                 client.roomId = roomId;

package/package.json

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