@venizia/ignis 0.0.5-5 → 0.0.5-6
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.
- package/dist/base/models/enrichers/principal.enricher.d.ts +15 -11
- package/dist/base/models/enrichers/principal.enricher.d.ts.map +1 -1
- package/dist/base/models/enrichers/principal.enricher.js +7 -1
- package/dist/base/models/enrichers/principal.enricher.js.map +1 -1
- package/dist/base/models/enrichers/user-audit.enricher.d.ts +2 -2
- package/dist/components/auth/models/entities/permission-mapping.model.d.ts +4 -4
- package/dist/components/auth/models/entities/permission-mapping.model.d.ts.map +1 -1
- package/dist/components/auth/models/entities/permission-mapping.model.js +3 -3
- package/dist/components/auth/models/entities/permission-mapping.model.js.map +1 -1
- package/dist/components/auth/models/entities/permission.model.d.ts +2 -2
- package/dist/components/auth/models/entities/permission.model.d.ts.map +1 -1
- package/dist/components/auth/models/entities/permission.model.js +1 -1
- package/dist/components/auth/models/entities/permission.model.js.map +1 -1
- package/dist/components/auth/models/entities/user-role.model.d.ts +7 -3
- package/dist/components/auth/models/entities/user-role.model.d.ts.map +1 -1
- package/dist/components/auth/models/entities/user-role.model.js +7 -1
- package/dist/components/auth/models/entities/user-role.model.js.map +1 -1
- package/dist/components/auth/models/entities/user.model.d.ts +1 -1
- package/dist/components/auth/models/entities/user.model.js +1 -1
- package/dist/components/auth/models/entities/user.model.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,29 +1,33 @@
|
|
|
1
|
-
import { PgIntegerBuilderInitial, PgTextBuilderInitial } from 'drizzle-orm/pg-core';
|
|
1
|
+
import { PgIntegerBuilderInitial, PgTextBuilderInitial, PgUUIDBuilderInitial } from 'drizzle-orm/pg-core';
|
|
2
2
|
import { TColumnDefinitions } from '../common/types';
|
|
3
3
|
import { HasDefault, NotNull } from 'drizzle-orm';
|
|
4
|
-
export type TPrincipalEnricherOptions<Discriminator extends string = string, IdType extends 'number' | 'string' = 'number' | 'string'> = {
|
|
4
|
+
export type TPrincipalEnricherOptions<Discriminator extends string = string, IdType extends 'number' | 'string' | 'uuid' = 'number' | 'string' | 'uuid'> = {
|
|
5
5
|
discriminator?: Discriminator;
|
|
6
6
|
defaultPolymorphic?: string;
|
|
7
7
|
polymorphicIdType: IdType;
|
|
8
8
|
};
|
|
9
|
-
type TPrincipalColumnDef<Discriminator extends string, IdType extends 'number' | 'string'> = IdType extends 'number' ? {
|
|
10
|
-
[K in `${Discriminator}Type`]: HasDefault<PgTextBuilderInitial<string, [string, ...string[]]>>;
|
|
11
|
-
} & {
|
|
9
|
+
type TPrincipalColumnDef<Discriminator extends string, IdType extends 'number' | 'string' | 'uuid'> = (IdType extends 'number' ? {
|
|
12
10
|
[K in `${Discriminator}Id`]: NotNull<PgIntegerBuilderInitial<string>>;
|
|
11
|
+
} : IdType extends 'uuid' ? {
|
|
12
|
+
[K in `${Discriminator}Id`]: NotNull<PgUUIDBuilderInitial<string>>;
|
|
13
13
|
} : {
|
|
14
|
-
[K in `${Discriminator}Type`]: HasDefault<PgTextBuilderInitial<string, [string, ...string[]]>>;
|
|
15
|
-
} & {
|
|
16
14
|
[K in `${Discriminator}Id`]: NotNull<PgTextBuilderInitial<string, [string, ...string[]]>>;
|
|
15
|
+
}) & {
|
|
16
|
+
[K in `${Discriminator}Type`]: HasDefault<PgTextBuilderInitial<string, [string, ...string[]]>>;
|
|
17
17
|
};
|
|
18
|
-
export declare const generatePrincipalColumnDefs: <Discriminator extends string = "principal", IdType extends "number" | "string" = "number">(opts: TPrincipalEnricherOptions<Discriminator, IdType>) => TPrincipalColumnDef<Discriminator, IdType>;
|
|
18
|
+
export declare const generatePrincipalColumnDefs: <Discriminator extends string = "principal", IdType extends "number" | "string" | "uuid" = "number">(opts: TPrincipalEnricherOptions<Discriminator, IdType>) => TPrincipalColumnDef<Discriminator, IdType>;
|
|
19
19
|
export declare const enrichPrincipal: <ColumnDefinitions extends TColumnDefinitions = TColumnDefinitions>(baseSchema: ColumnDefinitions, opts: TPrincipalEnricherOptions) => (ColumnDefinitions & {
|
|
20
|
-
[x: `${string}Type`]: HasDefault<PgTextBuilderInitial<string, [string, ...string[]]>>;
|
|
21
|
-
} & {
|
|
22
20
|
[x: `${string}Id`]: NotNull<PgTextBuilderInitial<string, [string, ...string[]]>>;
|
|
21
|
+
} & {
|
|
22
|
+
[x: `${string}Type`]: HasDefault<PgTextBuilderInitial<string, [string, ...string[]]>>;
|
|
23
23
|
}) | (ColumnDefinitions & {
|
|
24
|
+
[x: `${string}Id`]: NotNull<PgIntegerBuilderInitial<string>>;
|
|
25
|
+
} & {
|
|
24
26
|
[x: `${string}Type`]: HasDefault<PgTextBuilderInitial<string, [string, ...string[]]>>;
|
|
27
|
+
}) | (ColumnDefinitions & {
|
|
28
|
+
[x: `${string}Id`]: NotNull<PgUUIDBuilderInitial<string>>;
|
|
25
29
|
} & {
|
|
26
|
-
[x: `${string}
|
|
30
|
+
[x: `${string}Type`]: HasDefault<PgTextBuilderInitial<string, [string, ...string[]]>>;
|
|
27
31
|
});
|
|
28
32
|
export {};
|
|
29
33
|
//# sourceMappingURL=principal.enricher.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"principal.enricher.d.ts","sourceRoot":"","sources":["../../../../src/base/models/enrichers/principal.enricher.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"principal.enricher.d.ts","sourceRoot":"","sources":["../../../../src/base/models/enrichers/principal.enricher.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,EAGrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,MAAM,yBAAyB,CACnC,aAAa,SAAS,MAAM,GAAG,MAAM,EACrC,MAAM,SAAS,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,IACxE;IACF,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,KAAK,mBAAmB,CACtB,aAAa,SAAS,MAAM,EAC5B,MAAM,SAAS,QAAQ,GAAG,QAAQ,GAAG,MAAM,IACzC,CAAC,MAAM,SAAS,QAAQ,GACxB;KACG,CAAC,IAAI,GAAG,aAAa,IAAI,GAAG,OAAO,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;CACtE,GACD,MAAM,SAAS,MAAM,GACnB;KACG,CAAC,IAAI,GAAG,aAAa,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;CACnE,GACD;KACG,CAAC,IAAI,GAAG,aAAa,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;CAC1F,CAAC,GAAG;KACR,CAAC,IAAI,GAAG,aAAa,MAAM,GAAG,UAAU,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;CAC/F,CAAC;AAEF,eAAO,MAAM,2BAA2B,GACtC,aAAa,SAAS,MAAM,GAAG,WAAW,EAC1C,MAAM,SAAS,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,EAEtD,MAAM,yBAAyB,CAAC,aAAa,EAAE,MAAM,CAAC,KACrD,mBAAmB,CAAC,aAAa,EAAE,MAAM,CAoC3C,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,iBAAiB,SAAS,kBAAkB,GAAG,kBAAkB,EAC/F,YAAY,iBAAiB,EAC7B,MAAM,yBAAyB;;;;;;;;;;;;EAIhC,CAAC"}
|
|
@@ -24,8 +24,14 @@ const generatePrincipalColumnDefs = (opts) => {
|
|
|
24
24
|
[polymorphic.idField]: (0, pg_core_1.text)(polymorphic.idColumnName).notNull(),
|
|
25
25
|
};
|
|
26
26
|
}
|
|
27
|
+
case 'uuid': {
|
|
28
|
+
return {
|
|
29
|
+
[polymorphic.typeField]: (0, pg_core_1.text)(polymorphic.typeColumnName).default(defaultPolymorphic),
|
|
30
|
+
[polymorphic.idField]: (0, pg_core_1.uuid)(polymorphic.idColumnName).notNull(),
|
|
31
|
+
};
|
|
32
|
+
}
|
|
27
33
|
default: {
|
|
28
|
-
throw new Error(`[generatePrincipalColumnDefs] Invalid polymorphicIdType | value: ${polymorphic.idType} | valid: ['number', 'string']`);
|
|
34
|
+
throw new Error(`[generatePrincipalColumnDefs] Invalid polymorphicIdType | value: ${polymorphic.idType} | valid: ['number', 'string', 'uuid]`);
|
|
29
35
|
}
|
|
30
36
|
}
|
|
31
37
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"principal.enricher.js","sourceRoot":"","sources":["../../../../src/base/models/enrichers/principal.enricher.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"principal.enricher.js","sourceRoot":"","sources":["../../../../src/base/models/enrichers/principal.enricher.ts"],"names":[],"mappings":";;;AAAA,iDAO6B;AA8BtB,MAAM,2BAA2B,GAAG,CAIzC,IAAsD,EACV,EAAE;IAC9C,MAAM,EAAE,aAAa,GAAG,WAAW,EAAE,kBAAkB,GAAG,EAAE,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;IAEzF,MAAM,WAAW,GAAG;QAClB,SAAS,EAAE,GAAG,aAAa,MAAM;QACjC,cAAc,EAAE,GAAG,aAAa,OAAO;QACvC,OAAO,EAAE,GAAG,aAAa,IAAI;QAC7B,MAAM,EAAE,iBAAiB;QACzB,YAAY,EAAE,GAAG,aAAa,KAAK;KACpC,CAAC;IAEF,QAAQ,WAAW,CAAC,MAAM,EAAE,CAAC;QAC3B,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,OAAO;gBACL,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,IAAA,cAAI,EAAC,WAAW,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC;gBACrF,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,IAAA,iBAAO,EAAC,WAAW,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;aACrB,CAAC;QAClD,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,OAAO;gBACL,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,IAAA,cAAI,EAAC,WAAW,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC;gBACrF,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,IAAA,cAAI,EAAC,WAAW,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;aAClB,CAAC;QAClD,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,OAAO;gBACL,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,IAAA,cAAI,EAAC,WAAW,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC;gBACrF,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,IAAA,cAAI,EAAC,WAAW,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;aAClB,CAAC;QAClD,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,IAAI,KAAK,CACb,oEAAoE,WAAW,CAAC,MAAM,uCAAuC,CAC9H,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAzCW,QAAA,2BAA2B,+BAyCtC;AAEK,MAAM,eAAe,GAAG,CAC7B,UAA6B,EAC7B,IAA+B,EAC/B,EAAE;IACF,MAAM,IAAI,GAAG,IAAA,mCAA2B,EAAC,IAAI,CAAC,CAAC;IAC/C,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,IAAI,EAAE,CAAC;AACpC,CAAC,CAAC;AANW,QAAA,eAAe,mBAM1B"}
|
|
@@ -13,8 +13,8 @@ export type TUserAuditEnricherResult<ColumnDefinitions extends TColumnDefinition
|
|
|
13
13
|
modifiedBy: PgIntegerBuilderInitial<string> | PgTextBuilderInitial<string, [string, ...string[]]>;
|
|
14
14
|
};
|
|
15
15
|
export declare const generateUserAuditColumnDefs: (opts?: TUserAuditEnricherOptions) => {
|
|
16
|
-
createdBy: PgTextBuilderInitial<string, [string, ...string[]]
|
|
17
|
-
modifiedBy: PgTextBuilderInitial<string, [string, ...string[]]
|
|
16
|
+
createdBy: PgIntegerBuilderInitial<string> | PgTextBuilderInitial<string, [string, ...string[]]>;
|
|
17
|
+
modifiedBy: PgIntegerBuilderInitial<string> | PgTextBuilderInitial<string, [string, ...string[]]>;
|
|
18
18
|
};
|
|
19
19
|
export declare const enrichUserAudit: <ColumnDefinitions extends TColumnDefinitions = TColumnDefinitions>(baseSchema: ColumnDefinitions, opts?: TUserAuditEnricherOptions) => TUserAuditEnricherResult<ColumnDefinitions>;
|
|
20
20
|
export {};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { NotNull } from 'drizzle-orm';
|
|
2
|
-
import { PgIntegerBuilderInitial, PgTextBuilderInitial } from 'drizzle-orm/pg-core';
|
|
2
|
+
import { PgIntegerBuilderInitial, PgTextBuilderInitial, PgUUIDBuilderInitial } from 'drizzle-orm/pg-core';
|
|
3
3
|
export type TPermissionMappingOptions = {
|
|
4
4
|
idType?: 'string' | 'number';
|
|
5
5
|
};
|
|
@@ -9,9 +9,9 @@ export type TPermissionMappingCommonColumns = {
|
|
|
9
9
|
type TPermissionMappingColumnDef<Opts extends TPermissionMappingOptions | undefined = undefined> = Opts extends {
|
|
10
10
|
idType: infer IdType;
|
|
11
11
|
} ? IdType extends 'string' ? TPermissionMappingCommonColumns & {
|
|
12
|
-
userId:
|
|
13
|
-
roleId:
|
|
14
|
-
permissionId: NotNull<
|
|
12
|
+
userId: PgUUIDBuilderInitial<string>;
|
|
13
|
+
roleId: PgUUIDBuilderInitial<string>;
|
|
14
|
+
permissionId: NotNull<PgUUIDBuilderInitial<string>>;
|
|
15
15
|
} : TPermissionMappingCommonColumns & {
|
|
16
16
|
userId: PgIntegerBuilderInitial<string>;
|
|
17
17
|
roleId: PgIntegerBuilderInitial<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission-mapping.model.d.ts","sourceRoot":"","sources":["../../../../../src/components/auth/models/entities/permission-mapping.model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"permission-mapping.model.d.ts","sourceRoot":"","sources":["../../../../../src/components/auth/models/entities/permission-mapping.model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAEL,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,EAGrB,MAAM,qBAAqB,CAAC;AAG7B,MAAM,MAAM,yBAAyB,GAAG;IACtC,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC5C,MAAM,EAAE,oBAAoB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;CAC7D,CAAC;AAEF,KAAK,2BAA2B,CAAC,IAAI,SAAS,yBAAyB,GAAG,SAAS,GAAG,SAAS,IAC7F,IAAI,SAAS;IAAE,MAAM,EAAE,MAAM,MAAM,CAAA;CAAE,GACjC,MAAM,SAAS,QAAQ,GACrB,+BAA+B,GAAG;IAChC,MAAM,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACrC,YAAY,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC;CACrD,GACD,+BAA+B,GAAG;IAChC,MAAM,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACxC,YAAY,EAAE,OAAO,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;CACxD,GACH,+BAA+B,GAAG;IAChC,MAAM,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACxC,YAAY,EAAE,OAAO,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;CACxD,CAAC;AAER,eAAO,MAAM,6BAA6B,GAAI,IAAI,SAAS,yBAAyB,GAAG,SAAS,EAC9F,OAAO,IAAI,KACV,2BAA2B,CAAC,IAAI,CA0BlC,CAAC"}
|
|
@@ -9,9 +9,9 @@ const extraPermissionMappingColumns = (opts) => {
|
|
|
9
9
|
case 'string': {
|
|
10
10
|
return {
|
|
11
11
|
effect: (0, pg_core_1.text)('effect'),
|
|
12
|
-
userId: (0, pg_core_1.
|
|
13
|
-
roleId: (0, pg_core_1.
|
|
14
|
-
permissionId: (0, pg_core_1.
|
|
12
|
+
userId: (0, pg_core_1.uuid)('user_id'),
|
|
13
|
+
roleId: (0, pg_core_1.uuid)('role_id'),
|
|
14
|
+
permissionId: (0, pg_core_1.uuid)('permission_id').notNull(),
|
|
15
15
|
};
|
|
16
16
|
}
|
|
17
17
|
case 'number': {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission-mapping.model.js","sourceRoot":"","sources":["../../../../../src/components/auth/models/entities/permission-mapping.model.ts"],"names":[],"mappings":";;;AAAA,0DAAkD;AAGlD,
|
|
1
|
+
{"version":3,"file":"permission-mapping.model.js","sourceRoot":"","sources":["../../../../../src/components/auth/models/entities/permission-mapping.model.ts"],"names":[],"mappings":";;;AAAA,0DAAkD;AAGlD,iDAO6B;AA8BtB,MAAM,6BAA6B,GAAG,CAC3C,IAAW,EACwB,EAAE;IACrC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;IAEzC,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,OAAO;gBACL,MAAM,EAAE,IAAA,cAAI,EAAC,QAAQ,CAAC;gBACtB,MAAM,EAAE,IAAA,cAAI,EAAC,SAAS,CAAC;gBACvB,MAAM,EAAE,IAAA,cAAI,EAAC,SAAS,CAAC;gBACvB,YAAY,EAAE,IAAA,cAAI,EAAC,eAAe,CAAC,CAAC,OAAO,EAAE;aACT,CAAC;QACzC,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,OAAO;gBACL,MAAM,EAAE,IAAA,cAAI,EAAC,QAAQ,CAAC;gBACtB,MAAM,EAAE,IAAA,iBAAO,EAAC,SAAS,CAAC;gBAC1B,MAAM,EAAE,IAAA,iBAAO,EAAC,SAAS,CAAC;gBAC1B,YAAY,EAAE,IAAA,iBAAO,EAAC,eAAe,CAAC,CAAC,OAAO,EAAE;aACZ,CAAC;QACzC,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,IAAA,wBAAQ,EAAC;gBACb,OAAO,EAAE,4DAA4D,MAAM,EAAE;aAC9E,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AA5BW,QAAA,6BAA6B,iCA4BxC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { NotNull } from 'drizzle-orm';
|
|
2
|
-
import { PgIntegerBuilderInitial, PgTextBuilderInitial } from 'drizzle-orm/pg-core';
|
|
2
|
+
import { PgIntegerBuilderInitial, PgTextBuilderInitial, PgUUIDBuilderInitial } from 'drizzle-orm/pg-core';
|
|
3
3
|
export type TPermissionOptions = {
|
|
4
4
|
idType?: 'string' | 'number';
|
|
5
5
|
};
|
|
@@ -14,7 +14,7 @@ export type TPermissionCommonColumns = {
|
|
|
14
14
|
type TPermissionColumnDef<Opts extends TPermissionOptions | undefined = undefined> = Opts extends {
|
|
15
15
|
idType: infer IdType;
|
|
16
16
|
} ? IdType extends 'string' ? TPermissionCommonColumns & {
|
|
17
|
-
parentId:
|
|
17
|
+
parentId: PgUUIDBuilderInitial<string>;
|
|
18
18
|
} : TPermissionCommonColumns & {
|
|
19
19
|
parentId: PgIntegerBuilderInitial<string>;
|
|
20
20
|
} : TPermissionCommonColumns & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission.model.d.ts","sourceRoot":"","sources":["../../../../../src/components/auth/models/entities/permission.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"permission.model.d.ts","sourceRoot":"","sources":["../../../../../src/components/auth/models/entities/permission.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAEL,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,EAGrB,MAAM,qBAAqB,CAAC;AAG7B,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IACnE,IAAI,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IACnE,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IACtE,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IACpE,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IACrE,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;CACrE,CAAC;AAEF,KAAK,oBAAoB,CAAC,IAAI,SAAS,kBAAkB,GAAG,SAAS,GAAG,SAAS,IAAI,IAAI,SAAS;IAChG,MAAM,EAAE,MAAM,MAAM,CAAC;CACtB,GACG,MAAM,SAAS,QAAQ,GACrB,wBAAwB,GAAG;IACzB,QAAQ,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;CACxC,GACD,wBAAwB,GAAG;IACzB,QAAQ,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;CAC3C,GACH,wBAAwB,GAAG;IACzB,QAAQ,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;CAC3C,CAAC;AAEN,eAAO,MAAM,sBAAsB,GAAI,IAAI,SAAS,kBAAkB,GAAG,SAAS,EAChF,OAAO,IAAI,KACV,oBAAoB,CAAC,IAAI,CAgC3B,CAAC"}
|
|
@@ -25,7 +25,7 @@ const extraPermissionColumns = (opts) => {
|
|
|
25
25
|
pType: (0, pg_core_1.text)('p_type').notNull(),
|
|
26
26
|
action: (0, pg_core_1.text)('action').notNull(),
|
|
27
27
|
scope: (0, pg_core_1.text)('scope').notNull(),
|
|
28
|
-
parentId: (0, pg_core_1.
|
|
28
|
+
parentId: (0, pg_core_1.uuid)('parent_id'),
|
|
29
29
|
};
|
|
30
30
|
}
|
|
31
31
|
default: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission.model.js","sourceRoot":"","sources":["../../../../../src/components/auth/models/entities/permission.model.ts"],"names":[],"mappings":";;;AAAA,0DAAkD;AAElD,
|
|
1
|
+
{"version":3,"file":"permission.model.js","sourceRoot":"","sources":["../../../../../src/components/auth/models/entities/permission.model.ts"],"names":[],"mappings":";;;AAAA,0DAAkD;AAElD,iDAO6B;AA8BtB,MAAM,sBAAsB,GAAG,CACpC,IAAW,EACiB,EAAE;IAC9B,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;IAEzC,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,OAAO;gBACL,IAAI,EAAE,IAAA,cAAI,EAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;gBACrC,IAAI,EAAE,IAAA,cAAI,EAAC,MAAM,CAAC,CAAC,OAAO,EAAE;gBAC5B,OAAO,EAAE,IAAA,cAAI,EAAC,SAAS,CAAC,CAAC,OAAO,EAAE;gBAClC,KAAK,EAAE,IAAA,cAAI,EAAC,QAAQ,CAAC,CAAC,OAAO,EAAE;gBAC/B,MAAM,EAAE,IAAA,cAAI,EAAC,QAAQ,CAAC,CAAC,OAAO,EAAE;gBAChC,KAAK,EAAE,IAAA,cAAI,EAAC,OAAO,CAAC,CAAC,OAAO,EAAE;gBAC9B,QAAQ,EAAE,IAAA,iBAAO,EAAC,WAAW,CAAC;aACD,CAAC;QAClC,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,OAAO;gBACL,IAAI,EAAE,IAAA,cAAI,EAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;gBACrC,IAAI,EAAE,IAAA,cAAI,EAAC,MAAM,CAAC,CAAC,OAAO,EAAE;gBAC5B,OAAO,EAAE,IAAA,cAAI,EAAC,SAAS,CAAC,CAAC,OAAO,EAAE;gBAClC,KAAK,EAAE,IAAA,cAAI,EAAC,QAAQ,CAAC,CAAC,OAAO,EAAE;gBAC/B,MAAM,EAAE,IAAA,cAAI,EAAC,QAAQ,CAAC,CAAC,OAAO,EAAE;gBAChC,KAAK,EAAE,IAAA,cAAI,EAAC,OAAO,CAAC,CAAC,OAAO,EAAE;gBAC9B,QAAQ,EAAE,IAAA,cAAI,EAAC,WAAW,CAAC;aACE,CAAC;QAClC,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,IAAA,wBAAQ,EAAC;gBACb,OAAO,EAAE,qDAAqD,MAAM,EAAE;aACvE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAlCW,QAAA,sBAAsB,0BAkCjC"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
import { generatePrincipalColumnDefs } from '../../../../base/models';
|
|
2
2
|
import { NotNull } from 'drizzle-orm';
|
|
3
|
-
import { PgIntegerBuilderInitial, PgTextBuilderInitial } from 'drizzle-orm/pg-core';
|
|
3
|
+
import { PgIntegerBuilderInitial, PgTextBuilderInitial, PgUUIDBuilderInitial } from 'drizzle-orm/pg-core';
|
|
4
4
|
export type TUserRoleOptions = {
|
|
5
|
-
idType?: 'string' | 'number';
|
|
5
|
+
idType?: 'string' | 'number' | 'uuid';
|
|
6
6
|
};
|
|
7
|
-
export type TUserRoleCommonColumns = ReturnType<typeof generatePrincipalColumnDefs<'principal', 'number'>>;
|
|
7
|
+
export type TUserRoleCommonColumns = ReturnType<typeof generatePrincipalColumnDefs<'principal', 'string' | 'number' | 'uuid'>>;
|
|
8
8
|
type TUserRoleColumnDef<Opts extends TUserRoleOptions | undefined = undefined> = Opts extends {
|
|
9
9
|
idType: 'string';
|
|
10
10
|
} ? TUserRoleCommonColumns & {
|
|
11
11
|
userId: NotNull<PgTextBuilderInitial<string, [string, ...string[]]>>;
|
|
12
|
+
} : Opts extends {
|
|
13
|
+
idType: 'uuid';
|
|
14
|
+
} ? TUserRoleCommonColumns & {
|
|
15
|
+
userId: NotNull<PgUUIDBuilderInitial<string>>;
|
|
12
16
|
} : TUserRoleCommonColumns & {
|
|
13
17
|
userId: NotNull<PgIntegerBuilderInitial<string>>;
|
|
14
18
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-role.model.d.ts","sourceRoot":"","sources":["../../../../../src/components/auth/models/entities/user-role.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"user-role.model.d.ts","sourceRoot":"","sources":["../../../../../src/components/auth/models/entities/user-role.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAEL,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,EAGrB,MAAM,qBAAqB,CAAC;AAG7B,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,UAAU,CAC7C,OAAO,2BAA2B,CAAC,WAAW,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC,CAC9E,CAAC;AAEF,KAAK,kBAAkB,CAAC,IAAI,SAAS,gBAAgB,GAAG,SAAS,GAAG,SAAS,IAAI,IAAI,SAAS;IAC5F,MAAM,EAAE,QAAQ,CAAC;CAClB,GACG,sBAAsB,GAAG;IACvB,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;CACtE,GACD,IAAI,SAAS;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAC7B,sBAAsB,GAAG;IACvB,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC;CAC/C,GACD,sBAAsB,GAAG;IACvB,MAAM,EAAE,OAAO,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;CAClD,CAAC;AAER,eAAO,MAAM,oBAAoB,GAAI,IAAI,SAAS,gBAAgB,GAAG,SAAS,EAC5E,OAAO,IAAI,KACV,kBAAkB,CAAC,IAAI,CAgCzB,CAAC"}
|
|
@@ -8,7 +8,7 @@ const extraUserRoleColumns = (opts) => {
|
|
|
8
8
|
const { idType = 'number' } = opts ?? {};
|
|
9
9
|
const principalColumns = (0, models_1.generatePrincipalColumnDefs)({
|
|
10
10
|
defaultPolymorphic: 'Role',
|
|
11
|
-
polymorphicIdType:
|
|
11
|
+
polymorphicIdType: idType,
|
|
12
12
|
});
|
|
13
13
|
switch (idType) {
|
|
14
14
|
case 'number': {
|
|
@@ -23,6 +23,12 @@ const extraUserRoleColumns = (opts) => {
|
|
|
23
23
|
userId: (0, pg_core_1.text)('user_id').notNull(),
|
|
24
24
|
};
|
|
25
25
|
}
|
|
26
|
+
case 'uuid': {
|
|
27
|
+
return {
|
|
28
|
+
...principalColumns,
|
|
29
|
+
userId: (0, pg_core_1.uuid)('user_id').notNull(),
|
|
30
|
+
};
|
|
31
|
+
}
|
|
26
32
|
default: {
|
|
27
33
|
throw (0, ignis_helpers_1.getError)({
|
|
28
34
|
message: `[extraUserRoleColumns] Invalid idType | idType: ${idType}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-role.model.js","sourceRoot":"","sources":["../../../../../src/components/auth/models/entities/user-role.model.ts"],"names":[],"mappings":";;;AAAA,0CAA4D;AAC5D,0DAAkD;AAElD,
|
|
1
|
+
{"version":3,"file":"user-role.model.js","sourceRoot":"","sources":["../../../../../src/components/auth/models/entities/user-role.model.ts"],"names":[],"mappings":";;;AAAA,0CAA4D;AAC5D,0DAAkD;AAElD,iDAO6B;AAyBtB,MAAM,oBAAoB,GAAG,CAClC,IAAW,EACe,EAAE;IAC5B,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;IACzC,MAAM,gBAAgB,GAAG,IAAA,oCAA2B,EAAC;QACnD,kBAAkB,EAAE,MAAM;QAC1B,iBAAiB,EAAE,MAAM;KAC1B,CAAC,CAAC;IAEH,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,OAAO;gBACL,GAAG,gBAAgB;gBACnB,MAAM,EAAE,IAAA,iBAAO,EAAC,SAAS,CAAC,CAAC,OAAO,EAAE;aACT,CAAC;QAChC,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,OAAO;gBACL,GAAG,gBAAgB;gBACnB,MAAM,EAAE,IAAA,cAAI,EAAC,SAAS,CAAC,CAAC,OAAO,EAAE;aACN,CAAC;QAChC,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,OAAO;gBACL,GAAG,gBAAgB;gBACnB,MAAM,EAAE,IAAA,cAAI,EAAC,SAAS,CAAC,CAAC,OAAO,EAAE;aACN,CAAC;QAChC,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,IAAA,wBAAQ,EAAC;gBACb,OAAO,EAAE,mDAAmD,MAAM,EAAE;aACrE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAlCW,QAAA,oBAAoB,wBAkC/B"}
|
|
@@ -6,6 +6,6 @@ export declare const extraUserColumns: (opts?: {
|
|
|
6
6
|
type: import("drizzle-orm").HasDefault<import("drizzle-orm").NotNull<import("drizzle-orm/pg-core").PgTextBuilderInitial<"type", [string, ...string[]]>>>;
|
|
7
7
|
activatedAt: import("drizzle-orm/pg-core").PgTimestampBuilderInitial<"activated_at">;
|
|
8
8
|
lastLoginAt: import("drizzle-orm/pg-core").PgTimestampBuilderInitial<"last_login_at">;
|
|
9
|
-
parentId: import("drizzle-orm/pg-core").PgIntegerBuilderInitial<"parent_id"> | import("drizzle-orm/pg-core").
|
|
9
|
+
parentId: import("drizzle-orm/pg-core").PgIntegerBuilderInitial<"parent_id"> | import("drizzle-orm/pg-core").PgUUIDBuilderInitial<"parent_id">;
|
|
10
10
|
};
|
|
11
11
|
//# sourceMappingURL=user.model.d.ts.map
|
|
@@ -11,7 +11,7 @@ const extraUserColumns = (opts) => {
|
|
|
11
11
|
type: (0, pg_core_1.text)('type').notNull().default(common_1.UserTypes.SYSTEM),
|
|
12
12
|
activatedAt: (0, pg_core_1.timestamp)('activated_at', { mode: 'date', withTimezone: true }),
|
|
13
13
|
lastLoginAt: (0, pg_core_1.timestamp)('last_login_at', { mode: 'date', withTimezone: true }),
|
|
14
|
-
parentId: opts?.idType === 'string' ? (0, pg_core_1.
|
|
14
|
+
parentId: opts?.idType === 'string' ? (0, pg_core_1.uuid)('parent_id') : (0, pg_core_1.integer)('parent_id'),
|
|
15
15
|
};
|
|
16
16
|
};
|
|
17
17
|
exports.extraUserColumns = extraUserColumns;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.model.js","sourceRoot":"","sources":["../../../../../src/components/auth/models/entities/user.model.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"user.model.js","sourceRoot":"","sources":["../../../../../src/components/auth/models/entities/user.model.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AACnD,iDAAqE;AAErE,8FAA8F;AACvF,MAAM,gBAAgB,GAAG,CAAC,IAAsC,EAAE,EAAE;IACzE,OAAO;QACL,KAAK,EAAE,IAAA,cAAI,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;QAChC,MAAM,EAAE,IAAA,cAAI,EAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,qBAAY,CAAC,OAAO,CAAC;QAC9D,IAAI,EAAE,IAAA,cAAI,EAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,kBAAS,CAAC,MAAM,CAAC;QACtD,WAAW,EAAE,IAAA,mBAAS,EAAC,cAAc,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;QAC5E,WAAW,EAAE,IAAA,mBAAS,EAAC,eAAe,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;QAC7E,QAAQ,EAAE,IAAI,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,cAAI,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAO,EAAC,WAAW,CAAC;KAC/E,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,gBAAgB,oBAS3B;AAEF,8FAA8F"}
|