@domain.js/main 0.4.22 → 0.4.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -37,21 +37,21 @@ const schema = __importStar(require("./schema"));
37
37
  const sequelize = __importStar(require("./sequelize"));
38
38
  const signer = __importStar(require("./signer"));
39
39
  module.exports = {
40
- aes: aes,
41
- cache: cache,
42
- checker: checker,
43
- counter: counter,
44
- cron: cron,
45
- frequency: frequency,
46
- graceful: graceful,
47
- hash: hash,
48
- logger: logger,
49
- myCia: myCia,
50
- parallel: parallel,
51
- redis: redis,
52
- request: request,
53
- rest: rest,
54
- schema: schema,
55
- sequelize: sequelize,
56
- signer: signer,
40
+ "aes": aes,
41
+ "cache": cache,
42
+ "checker": checker,
43
+ "counter": counter,
44
+ "cron": cron,
45
+ "frequency": frequency,
46
+ "graceful": graceful,
47
+ "hash": hash,
48
+ "logger": logger,
49
+ "myCia": myCia,
50
+ "parallel": parallel,
51
+ "redis": redis,
52
+ "request": request,
53
+ "rest": rest,
54
+ "schema": schema,
55
+ "sequelize": sequelize,
56
+ "signer": signer,
57
57
  };
@@ -387,10 +387,9 @@ function Utils(cnf, deps) {
387
387
  findOptFilter(params, `${x.as}.${name}`, includeWhere, name);
388
388
  });
389
389
  if (!params._showDeleted) {
390
- if (x.model.rawAttributes.isDeleted || x.model.rawAttributes.deletedAt) {
391
- includeWhere[sequelize_1.Op.or] = [];
390
+ if (x.model.rawAttributes.isDeleted) {
392
391
  if (x.model.rawAttributes.isDeleted)
393
- includeWhere[sequelize_1.Op.or].push({ isDeleted: "no" });
392
+ includeWhere[sequelize_1.Op.or] = [{ isDeleted: "no" }];
394
393
  if (x.required === false)
395
394
  includeWhere[sequelize_1.Op.or].push({ id: null });
396
395
  }
package/dist/index.d.ts CHANGED
@@ -28,7 +28,7 @@ export declare function Main<T extends Readonly<Array<keyof TDeps>>>(features: T
28
28
  myCia: typeof import("./deps/myCia");
29
29
  parallel: typeof import("./deps/parallel");
30
30
  redis: typeof import("./deps/redis");
31
- request: typeof import("./deps/request");
31
+ request: typeof import("./deps/request"); /** 这里之所以要浅拷贝,是为了避免多次初始化之间互相干扰 */
32
32
  rest: typeof import("./deps/rest");
33
33
  schema: typeof import("./deps/schema");
34
34
  sequelize: typeof import("./deps/sequelize");
@@ -46,7 +46,7 @@ export declare function Main<T extends Readonly<Array<keyof TDeps>>>(features: T
46
46
  myCia: typeof import("./deps/myCia");
47
47
  parallel: typeof import("./deps/parallel");
48
48
  redis: typeof import("./deps/redis");
49
- request: typeof import("./deps/request");
49
+ request: typeof import("./deps/request"); /** 这里之所以要浅拷贝,是为了避免多次初始化之间互相干扰 */
50
50
  rest: typeof import("./deps/rest");
51
51
  schema: typeof import("./deps/schema");
52
52
  sequelize: typeof import("./deps/sequelize");
@@ -64,7 +64,7 @@ export declare function Main<T extends Readonly<Array<keyof TDeps>>>(features: T
64
64
  myCia: typeof import("./deps/myCia");
65
65
  parallel: typeof import("./deps/parallel");
66
66
  redis: typeof import("./deps/redis");
67
- request: typeof import("./deps/request");
67
+ request: typeof import("./deps/request"); /** 这里之所以要浅拷贝,是为了避免多次初始化之间互相干扰 */
68
68
  rest: typeof import("./deps/rest");
69
69
  schema: typeof import("./deps/schema");
70
70
  sequelize: typeof import("./deps/sequelize");
@@ -1,6 +1,6 @@
1
1
  /** 将 readonly string[] 转换成联合类型 */
2
2
  export declare type ReadonlyArray2union<T extends ReadonlyArray<any>> = T extends ReadonlyArray<infer A> ? A : never;
3
- declare type Type = "string" | "number" | "integer" | "object" | "array" | "boolean";
3
+ declare type Type = "string" | "number" | "integer" | "object" | "array" | "boolean" | "null";
4
4
  /** 接口参数 schema 定义的类型 */
5
5
  export interface ParamsSchema<Params extends {}, Keys extends string | number | symbol = keyof Params> {
6
6
  /** 接口整体描述信息 */
@@ -18,7 +18,7 @@ export interface ParamsSchema<Params extends {}, Keys extends string | number |
18
18
  /** 当前参数的描述信息 */
19
19
  description: string;
20
20
  /** 当前参数的类型 */
21
- type: Type | [Type];
21
+ type: Type | Type[] | readonly Type[];
22
22
  }>;
23
23
  }
24
24
  export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@domain.js/main",
3
- "version": "0.4.22",
3
+ "version": "0.4.24",
4
4
  "description": "DDD framework",
5
5
  "main": "dist/index.js",
6
6
  "bin": {