@domain.js/main 0.7.9 → 0.7.11

package/dist/deps/cache/Define.d.ts

@@ -1,5 +1,5 @@
-import LRU from "lru-cache";
 import Redis from "ioredis";
+import LRU from "lru-cache";
 import { SetRequired } from "type-fest";
 export interface CnfDef {
     cache?: {
@@ -12,13 +12,13 @@ export interface DepsDef {
     LRU: typeof LRU;
     IORedis: typeof Redis;
     logger: {
-        info(message: string, extra?: any): void;
-        error(error: Error, extra?: any): void;
+        info: (message: string, extra?: any) => void;
+        error: (error: Error, extra?: any) => void;
     };
 }
 export interface PubSubDef {
-    pub: SetRequired<Partial<Redis.Redis>, "publish">;
-    sub: SetRequired<Partial<Redis.Redis>, "on" | "subscribe">;
+    pub: SetRequired<Partial<Redis>, "publish">;
+    sub: SetRequired<Partial<Redis>, "on" | "subscribe">;
 }
 export interface Cache extends LRU<string, string> {
     caching: <T extends (...args: any[]) => Promise<any>>(func: T, life: number, getKey: (...args: Parameters<T>) => string, hit?: (hited: boolean) => void) => T;

package/dist/deps/redis/index.d.ts

@@ -1,6 +1,6 @@
-import Redis from "ioredis";
+import Redis, { RedisOptions } from "ioredis";
 interface Cnf {
-    redis: Redis.RedisOptions;
+    redis: RedisOptions;
 }
 interface Deps {
     IORedis: typeof Redis;
@@ -12,7 +12,7 @@ interface Deps {
  * @param cnf
  * @returns An instance of ioredis
  */
-export declare function Main(cnf: Cnf, deps: Deps): Redis.Redis & {
+export declare function Main(cnf: Cnf, deps: Deps): Redis & {
     update: (key: string, data: string) => Promise<void>;
 };
 export declare const Deps: string[];

package/dist/deps/rest/utils.js

@@ -376,8 +376,11 @@ function Utils(cnf, deps) {
             findOptFilter(params, name, where, Model.name);
         });
         if (!params._showDeleted) {
-            if (Model.rawAttributes.isDeleted)
+            const rawAttributes = Model.getAttributes();
+            if ("isDeleted" in rawAttributes)
                 where.isDeleted = "no";
+            if ("deletedAt" in rawAttributes)
+                where.deletedAt = null;
         }
         // 将搜索条件添加到主条件上
         const searchOptRes = searchOpt(Model, params._searchs, params.q);
@@ -392,10 +395,15 @@ function Utils(cnf, deps) {
                 _.each(filterAttrs, (name) => {
                     findOptFilter(params, `${x.as}.${name}`, includeWhere, x.as, name);
                 });
+                const rawAttributes = x.model.getAttributes();
                 if (!params._showDeleted) {
-                    if (x.model.rawAttributes.isDeleted) {
-                        if (x.model.rawAttributes.isDeleted)
-                            includeWhere[sequelize_1.Op.or] = [{ isDeleted: "no" }];
+                    if ("isDeleted" in rawAttributes) {
+                        includeWhere[sequelize_1.Op.or] = [{ isDeleted: "no" }];
+                        if (x.required === false)
+                            includeWhere[sequelize_1.Op.or].push({ id: null });
+                    }
+                    if ("deletedAt" in rawAttributes) {
+                        includeWhere[sequelize_1.Op.or] = [{ deletedAt: null }];
                         if (x.required === false)
                             includeWhere[sequelize_1.Op.or].push({ id: null });
                     }

package/dist/index.d.ts

@@ -33,7 +33,7 @@ export declare function Main<T extends Readonly<Array<keyof TDeps>>>(features: T
     schema: typeof import("./deps/schema");
     sequelize: typeof import("./deps/sequelize");
     signer: typeof import("./deps/signer");
-}[Include<"frequency", RemoveReadonlyArray<T>> | Include<"schema", RemoveReadonlyArray<T>> | Include<"logger", RemoveReadonlyArray<T>> | Include<"aes", RemoveReadonlyArray<T>> | Include<"request", RemoveReadonlyArray<T>> | Include<"sequelize", RemoveReadonlyArray<T>> | Include<"cache", RemoveReadonlyArray<T>> | Include<"redis", RemoveReadonlyArray<T>> | Include<"counter", RemoveReadonlyArray<T>> | Include<"cron", RemoveReadonlyArray<T>> | Include<"myCia", RemoveReadonlyArray<T>> | Include<"hash", RemoveReadonlyArray<T>> | Include<"rest", RemoveReadonlyArray<T>> | Include<"parallel", RemoveReadonlyArray<T>> | Include<"graceful", RemoveReadonlyArray<T>> | Include<"checker", RemoveReadonlyArray<T>> | Include<"signer", RemoveReadonlyArray<T>>]["Main"] extends (arg: infer R, ...args: any[]) => any ? R : {}>) => { [k in keyof Pick<{
+}[Include<"frequency", RemoveReadonlyArray<T>> | Include<"schema", RemoveReadonlyArray<T>> | Include<"logger", RemoveReadonlyArray<T>> | Include<"aes", RemoveReadonlyArray<T>> | Include<"request", RemoveReadonlyArray<T>> | Include<"redis", RemoveReadonlyArray<T>> | Include<"sequelize", RemoveReadonlyArray<T>> | Include<"cache", RemoveReadonlyArray<T>> | Include<"counter", RemoveReadonlyArray<T>> | Include<"cron", RemoveReadonlyArray<T>> | Include<"myCia", RemoveReadonlyArray<T>> | Include<"hash", RemoveReadonlyArray<T>> | Include<"rest", RemoveReadonlyArray<T>> | Include<"parallel", RemoveReadonlyArray<T>> | Include<"graceful", RemoveReadonlyArray<T>> | Include<"checker", RemoveReadonlyArray<T>> | Include<"signer", RemoveReadonlyArray<T>>]["Main"] extends (arg: infer R, ...args: any[]) => any ? R : {}>) => { [k in keyof Pick<{
     aes: typeof import("./deps/aes");
     cache: typeof import("./deps/cache");
     checker: typeof import("./deps/checker");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "0.7.9",
+  "version": "0.7.11",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {
@@ -54,7 +54,6 @@
   "dependencies": {
     "@types/async": "^3.2.10",
     "@types/crypto-js": "^4.0.2",
-    "@types/ioredis": "^4.28.1",
     "@types/jest": "^27.0.3",
     "@types/lodash": "^4.14.177",
     "@types/lru-cache": "^5.1.1",
@@ -71,14 +70,14 @@
     "crypto-js": "^4.1.1",
     "csv-stringify": "^6.0.2",
     "human-interval": "^2.0.1",
-    "ioredis": "^4.28.0",
+    "ioredis": "^5.4.1",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
     "moment": "^2.29.1",
     "mysql2": "^2.3.3",
     "restify": "^11.1.0",
     "restify-errors": "^8.0.2",
-    "sequelize": "^6.37.3",
+    "sequelize": "^6.37.5",
     "socket.io": "^4.4.1",
     "type-fest": "^2.8.0",
     "uuid": "^8.3.2",