@domain.js/main 0.4.11 → 0.4.13

package/dist/deps/rest/utils.js

@@ -69,18 +69,20 @@ function Utils(cnf, deps) {
         if (!value)
             return [[conf.default, conf.defaultDirection || "ASC"]];
         const orders = value.split(",").map((x) => {
+            var _a;
             const isDesc = x[0] === "-";
             const direction = isDesc ? "DESC" : "ASC";
             const order = isDesc ? x.slice(1) : x;
+            const theOrder = order.split(".");
             // 如果请求的排序方式不允许，则返回null
-            if (!conf.allow || !_.includes(conf.allow, order))
+            if (theOrder.length !== 2 && (!conf.allow || !_.includes(conf.allow, order)))
                 return undefined;
-            const theOrder = order.split(".");
             // 处理使用模型名称作为关联名称按关联模型的 字段 排序
             if (theOrder.length === 2) {
                 if (includes && Array.isArray(params._includes)) {
                     const ret = _.filter(params._includes, (val) => includes[val]);
-                    if (!ret.includes(theOrder[0])) {
+                    if (!ret.includes(theOrder[0]) ||
+                        !((_a = includes[theOrder[0]].model.sort) === null || _a === void 0 ? void 0 : _a.allow.includes(theOrder[1]))) {
                         return undefined;
                     }
                 }

package/dist/http/socket.js

@@ -158,12 +158,7 @@ function BridgeSocket(io, domain) {
             if (!client.inited)
                 return;
             // 这里要取消对领域消息的监听
-            try {
-                return await unsubscribe(client.profile, client);
-            }
-            catch (e) {
-                console.error(e);
-            }
+            await unsubscribe(client.profile, client).catch(console.error);
             if (client.quit)
                 client.quit();
         });

package/package.json

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