@hugo.ye/common 1.0.129 → 1.0.131

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.
@@ -1,6 +1,5 @@
1
1
  import { AbstractEntity } from '../index.js';
2
2
  import { RoleEntity } from './index.js';
3
- import { type Relation } from 'typeorm';
4
3
  export declare class PermissionEntity extends AbstractEntity<PermissionEntity> {
5
4
  name: string;
6
5
  action: string;
@@ -9,6 +8,6 @@ export declare class PermissionEntity extends AbstractEntity<PermissionEntity> {
9
8
  depth: number;
10
9
  parentId: number;
11
10
  type: number;
12
- role: Relation<RoleEntity>;
11
+ roles: RoleEntity[];
13
12
  }
14
13
  //# sourceMappingURL=permission.entity.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"permission.entity.d.ts","sourceRoot":"","sources":["../../src/models/permission.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAc,MAAM,aAAa,CAAC;AACrD,OAAO,EAML,KAAK,QAAQ,EACd,MAAM,SAAS,CAAC;AAEjB,qBAGa,gBAAiB,SAAQ,cAAc,CAAC,gBAAgB,CAAC;IAGpE,IAAI,EAAE,MAAM,CAAC;IAIb,MAAM,EAAE,MAAM,CAAC;IAIf,UAAU,EAAE,MAAM,CAAC;IAInB,MAAM,EAAE,MAAM,CAAC;IAIf,KAAK,EAAE,MAAM,CAAC;IAId,QAAQ,EAAE,MAAM,CAAC;IAIjB,IAAI,EAAE,MAAM,CAAC;IASb,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;CAC5B"}
1
+ {"version":3,"file":"permission.entity.d.ts","sourceRoot":"","sources":["../../src/models/permission.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAc,MAAM,aAAa,CAAC;AAWrD,qBAKa,gBAAiB,SAAQ,cAAc,CAAC,gBAAgB,CAAC;IAGpE,IAAI,EAAE,MAAM,CAAC;IAIb,MAAM,EAAE,MAAM,CAAC;IAIf,UAAU,EAAE,MAAM,CAAC;IAInB,MAAM,EAAE,MAAM,CAAC;IAIf,KAAK,EAAE,MAAM,CAAC;IAId,QAAQ,EAAE,MAAM,CAAC;IAIjB,IAAI,EAAE,MAAM,CAAC;IASb,KAAK,EAAE,UAAU,EAAE,CAAC;CACrB"}
@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
10
10
  import { Directive, Field, ObjectType } from '@nestjs/graphql';
11
11
  import { AbstractEntity } from '../index.js';
12
12
  import { RoleEntity, UserEntity } from './index.js';
13
- import { Column, Entity, JoinColumn, ManyToMany, ManyToOne, } from 'typeorm';
13
+ import { Column, Entity, JoinColumn, JoinTable, ManyToMany, ManyToOne, } from 'typeorm';
14
14
  let PermissionEntity = class PermissionEntity extends AbstractEntity {
15
15
  name;
16
16
  action;
@@ -19,7 +19,7 @@ let PermissionEntity = class PermissionEntity extends AbstractEntity {
19
19
  depth;
20
20
  parentId;
21
21
  type;
22
- role;
22
+ roles;
23
23
  };
24
24
  __decorate([
25
25
  Column(),
@@ -57,15 +57,15 @@ __decorate([
57
57
  __metadata("design:type", Number)
58
58
  ], PermissionEntity.prototype, "type", void 0);
59
59
  __decorate([
60
- ManyToOne(() => RoleEntity, (role) => role.permissions, {
60
+ ManyToMany(() => RoleEntity, (role) => role.permissions, {
61
+ cascade: true,
62
+ onDelete: 'CASCADE',
61
63
  nullable: true,
62
- onDelete: 'CASCADE'
63
64
  }),
64
- Field(() => RoleEntity, { nullable: true }),
65
65
  Directive('@shareable'),
66
- JoinColumn(),
67
- __metadata("design:type", Object)
68
- ], PermissionEntity.prototype, "role", void 0);
66
+ Field(() => [RoleEntity], { nullable: true }),
67
+ __metadata("design:type", Array)
68
+ ], PermissionEntity.prototype, "roles", void 0);
69
69
  PermissionEntity = __decorate([
70
70
  Entity(),
71
71
  ObjectType(),
@@ -1 +1 @@
1
- {"version":3,"file":"permission.entity.js","sourceRoot":"","sources":["../../src/models/permission.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,UAAU,EACV,SAAS,GAEV,MAAM,SAAS,CAAC;AAKV,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,cAAgC;IAGpE,IAAI,CAAS;IAIb,MAAM,CAAS;IAIf,UAAU,CAAS;IAInB,MAAM,CAAS;IAIf,KAAK,CAAS;IAId,QAAQ,CAAS;IAIjB,IAAI,CAAS;IASb,IAAI,CAAuB;CAC5B,CAAA;AAlCC;IAFC,MAAM,EAAE;IACR,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;8CACP;AAIb;IAFC,MAAM,EAAE;IACR,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;gDACL;AAIf;IAFC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;oDACR;AAInB;IAFC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACX;AAIf;IAFC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;+CACb;AAId;IAFC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;kDACV;AAIjB;IAFC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;8CACd;AASb;IAPC,SAAS,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE;QACvD,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,SAAS;KACpB,CAAC;IACD,KAAK,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC3C,SAAS,CAAC,YAAY,CAAC;IACvB,UAAU,EAAE;;8CACc;AApChB,gBAAgB;IAH5B,MAAM,EAAE;IACR,UAAU,EAAE;IACZ,SAAS,CAAC,qEAAqE,CAAC;GACpE,gBAAgB,CAqC5B"}
1
+ {"version":3,"file":"permission.entity.js","sourceRoot":"","sources":["../../src/models/permission.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,SAAS,EACT,UAAU,EACV,SAAS,GAEV,MAAM,SAAS,CAAC;AAOV,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,cAAgC;IAGpE,IAAI,CAAS;IAIb,MAAM,CAAS;IAIf,UAAU,CAAS;IAInB,MAAM,CAAS;IAIf,KAAK,CAAS;IAId,QAAQ,CAAS;IAIjB,IAAI,CAAS;IASb,KAAK,CAAe;CACrB,CAAA;AAlCC;IAFC,MAAM,EAAE;IACR,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;8CACP;AAIb;IAFC,MAAM,EAAE;IACR,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;gDACL;AAIf;IAFC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;oDACR;AAInB;IAFC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACX;AAIf;IAFC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;+CACb;AAId;IAFC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;kDACV;AAIjB;IAFC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;;8CACd;AASb;IAPC,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE;QACxD,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,SAAS,CAAC,YAAY,CAAC;IACvB,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC1B;AApCT,gBAAgB;IAL5B,MAAM,EAAE;IACR,UAAU,EAAE;IACZ,SAAS,CACR,qEAAqE,CACtE;GACY,gBAAgB,CAqC5B"}
@@ -1 +1 @@
1
- {"version":3,"file":"roles.entity.d.ts","sourceRoot":"","sources":["../../src/models/roles.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,qBAGa,UAAW,SAAQ,cAAc,CAAC,UAAU,CAAC;IAGxD,IAAI,EAAE,MAAM,CAAC;IAKb,KAAK,EAAE,UAAU,EAAE,CAAC;IASpB,WAAW,EAAE,gBAAgB,EAAE,CAAC;CACjC"}
1
+ {"version":3,"file":"roles.entity.d.ts","sourceRoot":"","sources":["../../src/models/roles.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,qBAGa,UAAW,SAAQ,cAAc,CAAC,UAAU,CAAC;IAGxD,IAAI,EAAE,MAAM,CAAC;IAKb,KAAK,EAAE,UAAU,EAAE,CAAC;IAoBpB,WAAW,EAAE,gBAAgB,EAAE,CAAC;CACjC"}
@@ -29,13 +29,24 @@ __decorate([
29
29
  __metadata("design:type", Array)
30
30
  ], RoleEntity.prototype, "users", void 0);
31
31
  __decorate([
32
- OneToMany(() => PermissionEntity, (permission) => permission.role, {
33
- nullable: true,
32
+ ManyToMany(() => PermissionEntity, (permission) => permission.roles, {
34
33
  cascade: true,
34
+ onDelete: 'CASCADE',
35
+ nullable: true
35
36
  }),
36
- JoinTable(),
37
37
  Directive('@shareable'),
38
38
  Field(() => [PermissionEntity], { nullable: true }),
39
+ JoinTable({
40
+ name: 'permission_entity_roles_role_entity', // 中间表名称
41
+ joinColumn: {
42
+ name: 'roleEntityId',
43
+ referencedColumnName: 'id',
44
+ },
45
+ inverseJoinColumn: {
46
+ name: 'permissionEntityId',
47
+ referencedColumnName: 'id',
48
+ },
49
+ }),
39
50
  __metadata("design:type", Array)
40
51
  ], RoleEntity.prototype, "permissions", void 0);
41
52
  RoleEntity = __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"roles.entity.js","sourceRoot":"","sources":["../../src/models/roles.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAKnD,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,cAA0B;IAGxD,IAAI,CAAS;IAKb,KAAK,CAAe;IASpB,WAAW,CAAqB;CACjC,CAAA;AAfC;IAFC,MAAM,EAAE;IACR,KAAK,EAAE;;wCACK;AAKb;IAHC,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;IAClD,SAAS,CAAC,YAAY,CAAC;IACvB,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC1B;AASpB;IAPC,SAAS,CAAC,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE;QAClE,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACd,CAAC;IACD,SAAS,EAAE;IACX,SAAS,CAAC,YAAY,CAAC;IACvB,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,gBAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACpB;AAjBrB,UAAU;IAHtB,MAAM,EAAE;IACR,UAAU,EAAE;IACZ,SAAS,CAAC,wBAAwB,CAAC;GACvB,UAAU,CAkBtB"}
1
+ {"version":3,"file":"roles.entity.js","sourceRoot":"","sources":["../../src/models/roles.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAKnD,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,cAA0B;IAGxD,IAAI,CAAS;IAKb,KAAK,CAAe;IAoBpB,WAAW,CAAqB;CACjC,CAAA;AA1BC;IAFC,MAAM,EAAE;IACR,KAAK,EAAE;;wCACK;AAKb;IAHC,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;IAClD,SAAS,CAAC,YAAY,CAAC;IACvB,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC1B;AAoBpB;IAlBC,UAAU,CAAC,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE;QACpE,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,SAAS,CAAC,YAAY,CAAC;IACvB,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,gBAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACnD,SAAS,CAAC;QACT,IAAI,EAAE,qCAAqC,EAAE,QAAQ;QACrD,UAAU,EAAE;YACV,IAAI,EAAE,cAAc;YACpB,oBAAoB,EAAE,IAAI;SAC3B;QACD,iBAAiB,EAAE;YACjB,IAAI,EAAE,oBAAoB;YAC1B,oBAAoB,EAAE,IAAI;SAC3B;KACF,CAAC;;+CAC8B;AA5BrB,UAAU;IAHtB,MAAM,EAAE;IACR,UAAU,EAAE;IACZ,SAAS,CAAC,wBAAwB,CAAC;GACvB,UAAU,CA6BtB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hugo.ye/common",
3
- "version": "1.0.129",
3
+ "version": "1.0.131",
4
4
  "description": "",
5
5
  "main": "./build/index.js",
6
6
  "types": "./build/index.d.ts",