@shivaedev/admin 0.8.2 → 0.10.0

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.
Files changed (61) hide show
  1. package/README.md +17 -3
  2. package/dist/jobs/page.d.ts +42 -13
  3. package/dist/jobs/page.d.ts.map +1 -1
  4. package/dist/jobs/retryPage.d.ts +60 -28
  5. package/dist/jobs/retryPage.d.ts.map +1 -1
  6. package/dist/jobs/retryPage.js +2 -1
  7. package/dist/jobs/retryPage.js.map +1 -1
  8. package/dist/jobs/schemas.d.ts +18 -4
  9. package/dist/jobs/schemas.d.ts.map +1 -1
  10. package/dist/jobs/schemas.js +5 -3
  11. package/dist/jobs/schemas.js.map +1 -1
  12. package/dist/permissions.d.ts +16 -2
  13. package/dist/permissions.d.ts.map +1 -1
  14. package/dist/permissions.js +1 -0
  15. package/dist/permissions.js.map +1 -1
  16. package/dist/registry.d.ts +14 -1
  17. package/dist/registry.d.ts.map +1 -1
  18. package/dist/registry.js +3 -0
  19. package/dist/registry.js.map +1 -1
  20. package/dist/server/jobsHandlers.d.ts +28 -9
  21. package/dist/server/jobsHandlers.d.ts.map +1 -1
  22. package/dist/server/jobsHandlers.js +23 -6
  23. package/dist/server/jobsHandlers.js.map +1 -1
  24. package/dist/server/jobsHandlersWithRetry.d.ts +2 -1
  25. package/dist/server/jobsHandlersWithRetry.d.ts.map +1 -1
  26. package/dist/server/jobsHandlersWithRetry.js +4 -0
  27. package/dist/server/jobsHandlersWithRetry.js.map +1 -1
  28. package/dist/server/mergeAdminRegistrations.d.ts +16 -0
  29. package/dist/server/mergeAdminRegistrations.d.ts.map +1 -0
  30. package/dist/server/mergeAdminRegistrations.js +9 -0
  31. package/dist/server/mergeAdminRegistrations.js.map +1 -0
  32. package/dist/server/registerAdmin.d.ts +1 -0
  33. package/dist/server/registerAdmin.d.ts.map +1 -1
  34. package/dist/server/registerAdmin.js +1 -1
  35. package/dist/server/registerAdmin.js.map +1 -1
  36. package/dist/server/users.d.ts +9 -34
  37. package/dist/server/users.d.ts.map +1 -1
  38. package/dist/server/users.js +24 -27
  39. package/dist/server/users.js.map +1 -1
  40. package/dist/server/usersHandlers.d.ts +2 -2
  41. package/dist/server/usersHandlers.d.ts.map +1 -1
  42. package/dist/server/usersHandlers.js.map +1 -1
  43. package/dist/users/page.d.ts +10 -10
  44. package/dist/users/page.d.ts.map +1 -1
  45. package/dist/users/page.js.map +1 -1
  46. package/dist/users/roles.d.ts +2 -2
  47. package/dist/users/roles.js +1 -1
  48. package/dist/users/roles.js.map +1 -1
  49. package/package.json +17 -17
  50. package/src/jobs/retryPage.ts +2 -1
  51. package/src/jobs/schemas.ts +5 -3
  52. package/src/permissions.ts +1 -0
  53. package/src/registry.ts +31 -1
  54. package/src/server/jobsHandlers.ts +26 -9
  55. package/src/server/jobsHandlersWithRetry.ts +4 -0
  56. package/src/server/mergeAdminRegistrations.ts +27 -0
  57. package/src/server/registerAdmin.ts +2 -1
  58. package/src/server/users.ts +27 -30
  59. package/src/server/usersHandlers.ts +2 -2
  60. package/src/users/page.ts +2 -2
  61. package/src/users/roles.ts +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"usersHandlers.js","sourceRoot":"","sources":["../../src/server/usersHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7D,MAAM,UAAU,aAAa,CAC5B,IAAyC,EACzC,MAAyE;IAEzE,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC;QACxC,wBAAwB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC;QAClE,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE,CAC7B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC;YAChC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,cAAc,EAAE,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC;QACnG,CAAC,CAAC;KACH,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"usersHandlers.js","sourceRoot":"","sources":["../../src/server/usersHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7D,MAAM,UAAU,aAAa,CAC5B,IAAyC,EACzC,MAA2D;IAE3D,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC;QACxC,wBAAwB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC;QAClE,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE,CAC7B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC;YAChC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,cAAc,EAAE,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC;QACnG,CAAC,CAAC;KACH,CAAC,CAAC;AACJ,CAAC"}
@@ -1,12 +1,12 @@
1
1
  import { Schema } from "effect";
2
- import type { roleSet } from "@shivaedev/access/roleSet.ts";
2
+ import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
3
3
  import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
4
4
  import { UsersPermission } from "#permissions.ts";
5
5
  import { LastRoleAssigner } from "#users/roles.ts";
6
6
  export declare const UsersList: Schema.Struct<{
7
7
  readonly next: Schema.OptionFromNullOr<Schema.String>;
8
8
  readonly users: Schema.$Array<Schema.Struct<{
9
- readonly createdAt: Schema.DateTimeUtcFromString;
9
+ readonly createdAt: Schema.DateTimeUtcFromDate;
10
10
  readonly email: Schema.String;
11
11
  readonly id: Schema.String;
12
12
  readonly name: Schema.String;
@@ -14,7 +14,7 @@ export declare const UsersList: Schema.Struct<{
14
14
  }>>;
15
15
  readonly canChangeRoles: Schema.Boolean;
16
16
  }>;
17
- export declare function usersPage<const TRole extends string>(access: Pick<ReturnType<typeof roleSet<TRole>>, "Role">): import("#page.ts").AdminPage & {
17
+ export declare function usersPage<const TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role">): import("#page.ts").AdminPage & {
18
18
  readonly id: "users";
19
19
  readonly contract: import("@shivaedev/contract/contract.ts").Contract<"admin.users", readonly [NoInfer<import("@shivaedev/contract/operation.ts").Query<"list", Schema.Struct<{
20
20
  readonly cursor: Schema.optionalKey<Schema.String>;
@@ -22,7 +22,7 @@ export declare function usersPage<const TRole extends string>(access: Pick<Retur
22
22
  }>, Schema.Struct<{
23
23
  readonly next: Schema.OptionFromNullOr<Schema.String>;
24
24
  readonly users: Schema.$Array<Schema.Struct<{
25
- readonly createdAt: Schema.DateTimeUtcFromString;
25
+ readonly createdAt: Schema.DateTimeUtcFromDate;
26
26
  readonly email: Schema.String;
27
27
  readonly id: Schema.String;
28
28
  readonly name: Schema.String;
@@ -66,22 +66,22 @@ export declare function usersPage<const TRole extends string>(access: Pick<Retur
66
66
  readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
67
67
  }>, Schema.Struct<{
68
68
  readonly _tag: Schema.Literal<"Resync">;
69
- }>]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>>, Schema.Never, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.list", Schema.Struct<{
69
+ }>]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>>, Schema.Never, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.changeRole", Schema.Struct<{
70
+ role: Schema.Literals<TRole[]>;
71
+ userId: Schema.String;
72
+ }>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastRoleAssigner)[]>, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.list", Schema.Struct<{
70
73
  readonly cursor: Schema.optionalKey<Schema.String>;
71
74
  readonly limit: Schema.Number;
72
75
  }>, Schema.Struct<{
73
76
  readonly next: Schema.OptionFromNullOr<Schema.String>;
74
77
  readonly users: Schema.$Array<Schema.Struct<{
75
- readonly createdAt: Schema.DateTimeUtcFromString;
78
+ readonly createdAt: Schema.DateTimeUtcFromDate;
76
79
  readonly email: Schema.String;
77
80
  readonly id: Schema.String;
78
81
  readonly name: Schema.String;
79
82
  readonly role: Schema.String;
80
83
  }>>;
81
84
  readonly canChangeRoles: Schema.Boolean;
82
- }>, Schema.Union<readonly [Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.changeRole", Schema.Struct<{
83
- role: Schema.Literals<TRole[]>;
84
- userId: Schema.String;
85
- }>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastRoleAssigner)[]>, typeof UsersPermission, never>, readonly [], undefined>;
85
+ }>, Schema.Union<readonly [Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof UsersPermission, never>, readonly [], undefined>;
86
86
  };
87
87
  //# sourceMappingURL=page.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAI5D,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAIrF,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAA2B,MAAM,iBAAiB,CAAC;AAI5E,eAAO,MAAM,SAAS;;;;;;;;;;EAAwE,CAAC;AAC/F,wBAAgB,SAAS,CAAC,KAAK,CAAC,KAAK,SAAS,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwB5G"}
1
+ {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAIjE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAIrF,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAA2B,MAAM,iBAAiB,CAAC;AAI5E,eAAO,MAAM,SAAS;;;;;;;;;;EAAwE,CAAC;AAC/F,wBAAgB,SAAS,CAAC,KAAK,CAAC,KAAK,SAAS,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwB9F"}
@@ -1 +1 @@
1
- {"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE5E,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAEvD,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;AAC/F,MAAM,UAAU,SAAS,CAA6B,MAAuD;IAC5G,OAAO,SAAS,CAAC;QAChB,QAAQ,EAAE,QAAQ,CAAC,aAAa,EAAE;YACjC,QAAQ,EAAE;gBACT,OAAO,CAAC,YAAY,EAAE;oBACrB,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBAC/B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;oBACrD,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,gBAAgB,EAAE,QAAQ,EAAE;iBACtE,CAAC;aACF;YACD,OAAO,EAAE;gBACR,KAAK,CAAC,MAAM,EAAE;oBACb,OAAO,EAAE,aAAa,CAAC,MAAM;oBAC7B,UAAU,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;oBACpG,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBACzB,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE;oBAC1C,OAAO,EAAE,SAAS;iBAClB,CAAC;aACF;SACD,CAAC;QACF,EAAE,EAAE,OAAO;QACX,UAAU,EAAE,eAAe;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE;KAC/C,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE5E,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAEvD,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;AAC/F,MAAM,UAAU,SAAS,CAA6B,MAAyC;IAC9F,OAAO,SAAS,CAAC;QAChB,QAAQ,EAAE,QAAQ,CAAC,aAAa,EAAE;YACjC,QAAQ,EAAE;gBACT,OAAO,CAAC,YAAY,EAAE;oBACrB,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBAC/B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;oBACrD,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,gBAAgB,EAAE,QAAQ,EAAE;iBACtE,CAAC;aACF;YACD,OAAO,EAAE;gBACR,KAAK,CAAC,MAAM,EAAE;oBACb,OAAO,EAAE,aAAa,CAAC,MAAM;oBAC7B,UAAU,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;oBACpG,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBACzB,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE;oBAC1C,OAAO,EAAE,SAAS;iBAClB,CAAC;aACF;SACD,CAAC;QACF,EAAE,EAAE,OAAO;QACX,UAAU,EAAE,eAAe;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE;KAC/C,CAAC,CAAC;AACJ,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import { Schema } from "effect";
2
2
  export declare const AppUser: Schema.Struct<{
3
- readonly createdAt: Schema.DateTimeUtcFromString;
3
+ readonly createdAt: Schema.DateTimeUtcFromDate;
4
4
  readonly email: Schema.String;
5
5
  readonly id: Schema.String;
6
6
  readonly name: Schema.String;
@@ -13,7 +13,7 @@ export declare const UserListInput: Schema.Struct<{
13
13
  export declare const UserList: Schema.Struct<{
14
14
  readonly next: Schema.OptionFromNullOr<Schema.String>;
15
15
  readonly users: Schema.$Array<Schema.Struct<{
16
- readonly createdAt: Schema.DateTimeUtcFromString;
16
+ readonly createdAt: Schema.DateTimeUtcFromDate;
17
17
  readonly email: Schema.String;
18
18
  readonly id: Schema.String;
19
19
  readonly name: Schema.String;
@@ -1,6 +1,6 @@
1
1
  import { Schema } from "effect";
2
2
  export const AppUser = Schema.Struct({
3
- createdAt: Schema.DateTimeUtcFromString,
3
+ createdAt: Schema.DateTimeUtcFromDate,
4
4
  email: Schema.String,
5
5
  id: Schema.String,
6
6
  name: Schema.String,
@@ -1 +1 @@
1
- {"version":3,"file":"roles.js","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC,qBAAqB;IACvC,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,MAAM;CACnB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1F,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAKtH,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;CAAG"}
1
+ {"version":3,"file":"roles.js","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC,mBAAmB;IACrC,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,MAAM;CACnB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1F,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAKtH,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;CAAG"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/admin",
3
- "version": "0.8.2",
3
+ "version": "0.10.0",
4
4
  "description": "Explicit admin page contracts and a protected native Effect RPC registry",
5
5
  "homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/admin#readme",
6
6
  "bugs": {
@@ -41,25 +41,25 @@
41
41
  "README.md"
42
42
  ],
43
43
  "dependencies": {
44
- "@shivaedev/access": "0.1.1",
45
- "@shivaedev/changes": "0.5.0",
46
- "@shivaedev/contract": "0.20.0",
47
- "@shivaedev/errors": "0.1.0",
48
- "@shivaedev/identity": "0.3.2",
49
- "@shivaedev/jobs": "0.22.0",
50
- "@shivaedev/react": "0.22.0",
51
- "@shivaedev/sql": "0.24.0"
44
+ "@shivaedev/access": "0.2.0",
45
+ "@shivaedev/changes": "0.5.1",
46
+ "@shivaedev/contract": "0.22.0",
47
+ "@shivaedev/errors": "0.1.2",
48
+ "@shivaedev/identity": "0.5.0",
49
+ "@shivaedev/jobs": "0.23.0",
50
+ "@shivaedev/react": "0.23.0",
51
+ "@shivaedev/sql": "0.26.0"
52
52
  },
53
53
  "devDependencies": {
54
- "@effect/atom-react": "4.0.5",
55
- "@shivaedev/quality": "0.44.1",
56
- "@shivaedev/server": "0.4.0",
57
- "@shivaedev/test-sql": "0.10.2",
58
- "@shivaedev/test-story": "0.23.0",
54
+ "@effect/atom-react": "4.0.6",
55
+ "@shivaedev/quality": "0.46.0",
56
+ "@shivaedev/server": "0.6.0",
57
+ "@shivaedev/test-sql": "0.12.0",
58
+ "@shivaedev/test-story": "0.25.0",
59
59
  "@types/node": "24.19.2",
60
60
  "@types/react": "19.3.0",
61
61
  "@types/react-dom": "19.3.0",
62
- "effect": "4.0.5",
62
+ "effect": "4.0.6",
63
63
  "happy-dom": "21.0.4",
64
64
  "react": "19.3.1",
65
65
  "react-dom": "19.3.1",
@@ -67,8 +67,8 @@
67
67
  "vitest": "5.0.5"
68
68
  },
69
69
  "peerDependencies": {
70
- "@effect/atom-react": "4.0.5",
71
- "effect": "4.0.5",
70
+ "@effect/atom-react": "4.0.6",
71
+ "effect": "4.0.6",
72
72
  "react": "19.3.1"
73
73
  },
74
74
  "engines": {
@@ -1,6 +1,7 @@
1
1
  import { Schema } from "effect";
2
2
  import { contract } from "@shivaedev/contract/contract.ts";
3
3
  import { command } from "@shivaedev/contract/operation.ts";
4
+ import { Forbidden } from "@shivaedev/errors/taxonomy.ts";
4
5
  import { adminPage } from "#page.ts";
5
6
  import { JobsPermission } from "#permissions.ts";
6
7
  import type { JobsEntry } from "./entry.ts";
@@ -28,7 +29,7 @@ export function jobsPageWithRetry<const TQueues extends readonly JobsEntry[]>(..
28
29
  jobsKeys.job(queue).item(id),
29
30
  ],
30
31
  payload: { id: Schema.String, queue: Schema.String },
31
- rejections: { ...JobsFailures, JobsNotFailed },
32
+ rejections: { ...JobsFailures, Forbidden, JobsNotFailed },
32
33
  }),
33
34
  ],
34
35
  queries: page.contract.declaration.queries,
@@ -1,4 +1,6 @@
1
1
  import { Schema } from "effect";
2
+ import { BadRequest } from "@shivaedev/errors/taxonomy.ts";
3
+ import { JobFailure } from "@shivaedev/jobs/JobFailure.ts";
2
4
 
3
5
  export interface JobsQueue {
4
6
  readonly name: string;
@@ -17,7 +19,7 @@ export class JobsQueueUnregistered extends Schema.TaggedError<JobsQueueUnregiste
17
19
  queue: Schema.String,
18
20
  }) {}
19
21
 
20
- export const JobsFailures = { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable };
22
+ export const JobsFailures = { BadRequest, JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable };
21
23
 
22
24
  export const QueueCounts = Schema.Struct({
23
25
  activeCount: Schema.Number,
@@ -49,7 +51,7 @@ export const JobFields = {
49
51
  completedOn: Schema.OptionFromNullOr(Schema.DateTimeUtcFromString),
50
52
  createdOn: Schema.DateTimeUtcFromString,
51
53
  id: Schema.String,
52
- output: Schema.Unknown,
54
+ output: Schema.NullOr(JobFailure),
53
55
  retryCount: Schema.Number,
54
56
  retryLimit: Schema.Number,
55
57
  startedOn: Schema.OptionFromNullOr(Schema.DateTimeUtcFromString),
@@ -69,7 +71,7 @@ export function deadLetteredSchema<TPayload extends Schema.Top>(queue: { readonl
69
71
  data: queue.schema,
70
72
  queue: Schema.Literal(name),
71
73
  sourceId: Schema.OptionFromNullOr(Schema.String),
72
- sourceOutput: Schema.Unknown,
74
+ sourceOutput: Schema.NullOr(JobFailure),
73
75
  });
74
76
  }
75
77
 
@@ -4,5 +4,6 @@ import { permissionMiddleware } from "@shivaedev/identity/permission.ts";
4
4
  export const ReadUsers = permission("users.read");
5
5
  export const AssignRoles = permission("roles.assign");
6
6
  export const ReadJobs = permission("jobs.read");
7
+ export const RetryJobs = permission("jobs.retry");
7
8
  export class UsersPermission extends permissionMiddleware<UsersPermission>()("@shivaedev/admin/UsersPermission", ReadUsers) {}
8
9
  export class JobsPermission extends permissionMiddleware<JobsPermission>()("@shivaedev/admin/JobsPermission", ReadJobs) {}
package/src/registry.ts CHANGED
@@ -6,7 +6,37 @@ export interface AdminRegistry<TPages extends readonly AdminPage[]> {
6
6
  readonly pages: TPages;
7
7
  }
8
8
 
9
- export function adminRegistry<const TPages extends readonly AdminPage[]>(...pages: TPages): AdminRegistry<TPages> {
9
+ export interface AnyAdminRegistry {
10
+ readonly group: RpcGroup.Any;
11
+ readonly pages: readonly AdminPage[];
12
+ }
13
+
14
+ export type UniquePageIds<TPages extends readonly AdminPage[], TSeen extends string = never> = TPages extends readonly [
15
+ infer TPage extends AdminPage,
16
+ ...infer TRest extends readonly AdminPage[],
17
+ ]
18
+ ? TPage["id"] extends TSeen
19
+ ? never
20
+ : UniquePageIds<TRest, TSeen | TPage["id"]>
21
+ : unknown;
22
+
23
+ export type RegistryPages<TRegistries extends readonly AnyAdminRegistry[]> = TRegistries extends readonly [
24
+ infer TFirst extends AnyAdminRegistry,
25
+ ...infer TRest extends readonly AnyAdminRegistry[],
26
+ ]
27
+ ? readonly [...TFirst["pages"], ...RegistryPages<TRest>]
28
+ : number extends TRegistries["length"]
29
+ ? readonly TRegistries[number]["pages"][number][]
30
+ : readonly [];
31
+
32
+ export function mergeAdminRegistries<const TRegistries extends readonly AnyAdminRegistry[]>(
33
+ ...registries: TRegistries & UniquePageIds<RegistryPages<TRegistries>>
34
+ ): AdminRegistry<RegistryPages<TRegistries>>;
35
+ export function mergeAdminRegistries(...registries: readonly AnyAdminRegistry[]) {
36
+ return adminRegistry(...registries.flatMap((registry) => registry.pages));
37
+ }
38
+
39
+ export function adminRegistry<const TPages extends readonly AdminPage[]>(...pages: TPages & UniquePageIds<TPages>): AdminRegistry<TPages> {
10
40
  const ids = new Set<string>();
11
41
  const paths = new Set<string>();
12
42
  const tags = new Set<string>();
@@ -1,15 +1,24 @@
1
- import { type Context, DateTime, Effect, Option } from "effect";
1
+ import { type Context, DateTime, Effect, Option, Schema } from "effect";
2
+ import { BadRequest } from "@shivaedev/errors/taxonomy.ts";
3
+ import { JobFailure } from "@shivaedev/jobs/JobFailure.ts";
2
4
  import type { PgBossError, PgBossPayloadError } from "@shivaedev/jobs/server/error.ts";
3
5
  import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
4
6
  import { type JobsEntry, type JobsPayload, jobsQueue } from "#jobs/entry.ts";
5
7
  import type { jobsPage } from "#jobs/page.ts";
6
8
  import { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
7
9
 
8
- export function jobsFailures<A, R>(effect: Effect.Effect<A, PgBossError | PgBossPayloadError, R>) {
10
+ export function jobsFailures<A, R>(effect: Effect.Effect<A, PgBossError | PgBossPayloadError | Schema.SchemaError, R>) {
9
11
  return effect.pipe(
10
- Effect.mapError((error) =>
11
- error._tag === "PgBossPayloadError" ? new JobsPayloadInvalid({ queue: error.queue }) : new JobsUnavailable({ operation: error.operation }),
12
- ),
12
+ Effect.mapError((error) => {
13
+ switch (error._tag) {
14
+ case "SchemaError":
15
+ return new BadRequest({ message: "Invalid job page options" });
16
+ case "PgBossPayloadError":
17
+ return new JobsPayloadInvalid({ queue: error.queue });
18
+ case "PgBossError":
19
+ return new JobsUnavailable({ operation: error.operation });
20
+ }
21
+ }),
13
22
  );
14
23
  }
15
24
 
@@ -44,7 +53,7 @@ export function jobsReadHandlers<const TQueues extends readonly JobsEntry[], TSe
44
53
  "admin.jobs.health": () =>
45
54
  Effect.gen(function* () {
46
55
  const jobs = yield* service;
47
- const health = yield* jobsFailures(jobs.health);
56
+ const health = yield* jobsFailures(jobs.health());
48
57
  const visible = health.jobs.filter((queue) => page.queues.some((candidate) => candidate.name === queue.name));
49
58
  return {
50
59
  activeTotal: visible.reduce((sum, queue) => sum + queue.activeCount, 0),
@@ -59,19 +68,27 @@ export function jobsReadHandlers<const TQueues extends readonly JobsEntry[], TSe
59
68
  Effect.gen(function* () {
60
69
  const definition = yield* registered(queue);
61
70
  const jobs = yield* service;
62
- return Option.map(yield* jobsFailures(jobs.getJob<string, JobsPayload<TQueues[number]>>(definition, id)), (job) => ({
71
+ const result = yield* jobsFailures(jobs.getJob<string, JobsPayload<TQueues[number]>>(definition, id));
72
+ if (Option.isNone(result)) {
73
+ return Option.none();
74
+ }
75
+ const job = result.value;
76
+ const output = yield* Schema.decodeUnknownEffect(Schema.NullOr(JobFailure))(job.output).pipe(
77
+ Effect.mapError(() => new JobsPayloadInvalid({ queue })),
78
+ );
79
+ return Option.some({
63
80
  attempt: job.startedOn === null ? 0 : job.retryCount + 1,
64
81
  completedOn: Option.map(Option.fromNullishOr(job.completedOn), DateTime.makeUnsafe),
65
82
  createdOn: DateTime.makeUnsafe(job.createdOn),
66
83
  data: job.data,
67
84
  id: job.id,
68
- output: job.output,
85
+ output,
69
86
  queue: job.name,
70
87
  retryCount: job.retryCount,
71
88
  retryLimit: job.retryLimit,
72
89
  startedOn: Option.map(Option.fromNullishOr(job.startedOn), DateTime.makeUnsafe),
73
90
  state: job.state,
74
- }));
91
+ });
75
92
  }),
76
93
  };
77
94
  }
@@ -1,8 +1,11 @@
1
1
  import { type Context, Effect, Option } from "effect";
2
+ import { requirePermission } from "@shivaedev/access/requirePermission.ts";
3
+ import { SessionUser } from "@shivaedev/identity/identity.ts";
2
4
  import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
3
5
  import { type JobsEntry, type JobsPayload, jobsQueue } from "#jobs/entry.ts";
4
6
  import { JobsNotFailed, type jobsPageWithRetry } from "#jobs/retryPage.ts";
5
7
  import { JobsQueueUnregistered } from "#jobs/schemas.ts";
8
+ import { RetryJobs } from "#permissions.ts";
6
9
  import { jobsFailures, jobsReadHandlers } from "./jobsHandlers.ts";
7
10
 
8
11
  export function jobsHandlersWithRetry<const TQueues extends readonly JobsEntry[], TService>(
@@ -13,6 +16,7 @@ export function jobsHandlersWithRetry<const TQueues extends readonly JobsEntry[]
13
16
  ...jobsReadHandlers(page, service),
14
17
  "admin.jobs.retry": ({ queue, id }) =>
15
18
  Effect.gen(function* () {
19
+ yield* requirePermission(yield* SessionUser, RetryJobs);
16
20
  const entries: readonly TQueues[number][] = page.queues;
17
21
  const entry = entries.find((candidate) => candidate.name === queue);
18
22
  if (entry === undefined) {
@@ -0,0 +1,27 @@
1
+ import { Layer } from "effect";
2
+ import type { Rpc, RpcGroup } from "effect/rpc";
3
+ import { type AdminRegistry, type AnyAdminRegistry, mergeAdminRegistries, type RegistryPages, type UniquePageIds } from "#registry.ts";
4
+
5
+ type Registration = AnyAdminRegistry & { readonly handlers: Layer.Layer<never, unknown, unknown> };
6
+
7
+ type ModuleHandlers<TModules extends readonly Registration[]> = {
8
+ readonly [TIndex in keyof TModules]: {
9
+ readonly handlers: Layer.Layer<Rpc.ToHandler<RpcGroup.Rpcs<TModules[TIndex]["pages"][number]["contract"]["application"]>>, unknown, unknown>;
10
+ };
11
+ };
12
+
13
+ export function mergeAdminRegistrations<const TModules extends readonly Registration[]>(
14
+ ...modules: TModules & NoInfer<ModuleHandlers<TModules>> & UniquePageIds<RegistryPages<TModules>>
15
+ ): AdminRegistry<RegistryPages<TModules>> & {
16
+ readonly handlers: Layer.Layer<
17
+ Layer.Success<TModules[number]["handlers"]>,
18
+ Layer.Error<TModules[number]["handlers"]>,
19
+ Layer.Services<TModules[number]["handlers"]>
20
+ >;
21
+ };
22
+ export function mergeAdminRegistrations(...modules: readonly Registration[]) {
23
+ return {
24
+ ...mergeAdminRegistries(...modules),
25
+ handlers: Layer.mergeAll(Layer.empty, ...modules.map((module) => module.handlers)),
26
+ };
27
+ }
@@ -14,6 +14,7 @@ export function registerAdmin<const TPages extends readonly AdminPage[], THandle
14
14
  handlers: THandlers & Record<Exclude<keyof THandlers, TPages[number]["id"]>, never>,
15
15
  ): {
16
16
  readonly group: AdminRegistry<TPages>["group"];
17
+ readonly pages: TPages;
17
18
  readonly handlers: Layer.Layer<
18
19
  Layer.Success<RegisteredLayers<THandlers>>,
19
20
  Layer.Error<RegisteredLayers<THandlers>>,
@@ -35,5 +36,5 @@ export function registerAdmin(
35
36
  throw new Error(`Unregistered admin handlers: ${id}`);
36
37
  }
37
38
  }
38
- return { group: registry.group, handlers: Layer.mergeAll(Layer.empty, ...Object.values(handlers)) };
39
+ return { group: registry.group, handlers: Layer.mergeAll(Layer.empty, ...Object.values(handlers)), pages: registry.pages };
39
40
  }
@@ -1,71 +1,68 @@
1
1
  import { DateTime, Effect, Option, Schema } from "effect";
2
2
  import { SqlClient, SqlSchema } from "effect/sql";
3
- import type { roleSet } from "@shivaedev/access/roleSet.ts";
3
+ import { requirePermission } from "@shivaedev/access/requirePermission.ts";
4
+ import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
4
5
  import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
5
6
  import { SessionUser } from "@shivaedev/identity/identity.ts";
6
- import { requirePermission } from "@shivaedev/identity/permission.ts";
7
7
  import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
8
8
  import { AssignRoles, ReadUsers } from "#permissions.ts";
9
- import { type ChangeRoleInput, LastRoleAssigner, type UserListInput } from "#users/roles.ts";
9
+ import { AppUser, type ChangeRoleInput, LastRoleAssigner, type UserListInput } from "#users/roles.ts";
10
10
 
11
- const StoredUser = Schema.Struct({
12
- createdAt: Schema.Date,
13
- email: Schema.String,
14
- id: Schema.String,
15
- name: Schema.String,
16
- role: Schema.String,
17
- });
18
11
  function unavailable() {
19
12
  return new AuthUnavailable({ message: "Could not access app users" });
20
13
  }
21
14
 
22
- export const listUsers = Effect.fn("Platform.listUsers")(function* <TRole extends string>(
23
- access: Pick<ReturnType<typeof roleSet<TRole>>, "Role">,
15
+ export const listUsers = Effect.fn("Admin.listUsers")(function* <TRole extends string>(
16
+ access: Pick<AccessPolicy<TRole>, "Role">,
24
17
  input: typeof UserListInput.Type,
25
18
  ) {
26
- yield* requirePermission(ReadUsers);
19
+ yield* requirePermission(yield* SessionUser, ReadUsers);
27
20
  const sql = yield* SqlClient.SqlClient;
28
21
  const read = SqlSchema.findAll({
29
22
  execute: () => sql`select id, name, email, role, "createdAt" from "user"
30
23
  where id > ${input.cursor ?? ""} order by id limit ${input.limit + 1}`,
31
24
  Request: Schema.Void,
32
- Result: Schema.Struct({ ...StoredUser.fields, role: access.Role }),
25
+ Result: Schema.Struct({ ...AppUser.fields, role: access.Role }),
33
26
  });
34
27
  const rows = yield* read(undefined).pipe(Effect.mapError(unavailable));
35
- const users = rows.slice(0, input.limit).map(({ role, createdAt, ...user }) => ({
36
- ...user,
37
- createdAt: DateTime.makeUnsafe(createdAt),
38
- role,
39
- }));
28
+ const users = rows.slice(0, input.limit);
40
29
  return { next: rows.length > input.limit ? Option.fromUndefinedOr(users.at(-1)?.id) : Option.none<string>(), users };
41
30
  });
42
31
 
43
- export const changeUserRole = Effect.fn("Platform.changeUserRole")(function* <TRole extends string>(
44
- access: Pick<ReturnType<typeof roleSet<TRole>>, "Role" | "hasPermission">,
32
+ export const changeUserRole = Effect.fn("Admin.changeUserRole")(function* <TRole extends string>(
33
+ access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">,
45
34
  input: ChangeRoleInput<TRole>,
46
35
  ) {
47
36
  const actor = yield* SessionUser;
48
- yield* requirePermission(AssignRoles);
37
+ yield* requirePermission(actor, AssignRoles);
49
38
  const sql = yield* SqlClient.SqlClient;
50
39
  const changed = yield* Effect.gen(function* () {
51
40
  yield* sql`select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
52
- const rows = yield* sql<{ readonly id: string; readonly role: string | null }>`select id, role from "user" where id = ${input.userId} for update`;
53
- const target = rows[0];
54
- if (target === undefined) {
41
+ const readTarget = SqlSchema.findOneOption({
42
+ execute: (id) => sql`select id, role from "user" where id = ${id} for update`,
43
+ Request: AppUser.fields.id,
44
+ Result: Schema.Struct({ id: AppUser.fields.id, role: Schema.NullOr(AppUser.fields.role) }),
45
+ });
46
+ const target = yield* readTarget(input.userId).pipe(Effect.mapError(unavailable));
47
+ if (Option.isNone(target)) {
55
48
  return yield* Effect.fail(new NotFound({ message: "User not found" }));
56
49
  }
57
- const next = yield* Schema.decodeUnknownEffect(access.Role)(input.role).pipe(Effect.mapError(unavailable));
58
- if (target.role === next) {
50
+ if (target.value.role === input.role) {
59
51
  return false;
60
52
  }
61
53
  const assigners = access.Role.literals.filter((role) => access.hasPermission(role, AssignRoles));
62
- if (assigners.some((role) => role === target.role) && !access.hasPermission(next, AssignRoles)) {
63
- const holders = yield* sql<{ readonly id: string }>`select id from "user" where role in ${sql.in(assigners)}`;
54
+ if (assigners.some((role) => role === target.value.role) && !access.hasPermission(input.role, AssignRoles)) {
55
+ const readHolders = SqlSchema.findAll({
56
+ execute: () => sql`select id from "user" where role in ${sql.in(assigners)}`,
57
+ Request: Schema.Void,
58
+ Result: Schema.Struct({ id: AppUser.fields.id }),
59
+ });
60
+ const holders = yield* readHolders(undefined).pipe(Effect.mapError(unavailable));
64
61
  if (holders.length === 1) {
65
62
  return yield* Effect.fail(new LastRoleAssigner({ userId: input.userId }));
66
63
  }
67
64
  }
68
- yield* sql`update "user" set role = ${next}, "updatedAt" = now() where id = ${input.userId}`;
65
+ yield* sql`update "user" set role = ${input.role}, "updatedAt" = now() where id = ${input.userId}`;
69
66
  yield* invalidateOnCommit(["admin.users"]);
70
67
  return true;
71
68
  }).pipe(transact({ onSqlError: unavailable }));
@@ -1,5 +1,5 @@
1
1
  import { Effect } from "effect";
2
- import type { roleSet } from "@shivaedev/access/roleSet.ts";
2
+ import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
3
3
  import { SessionUser } from "@shivaedev/identity/identity.ts";
4
4
  import { hasPermission } from "@shivaedev/identity/permission.ts";
5
5
  import { AssignRoles } from "#permissions.ts";
@@ -8,7 +8,7 @@ import type { usersPage } from "#users/page.ts";
8
8
 
9
9
  export function usersHandlers<const TRole extends string>(
10
10
  page: ReturnType<typeof usersPage<TRole>>,
11
- access: Pick<ReturnType<typeof roleSet<TRole>>, "Role" | "hasPermission">,
11
+ access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">,
12
12
  ) {
13
13
  return page.contract.application.toLayer({
14
14
  "admin.users.changeRole": (input) => changeUserRole(access, input),
package/src/users/page.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Effect, Schema } from "effect";
2
- import type { roleSet } from "@shivaedev/access/roleSet.ts";
2
+ import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
3
3
  import { collection } from "@shivaedev/changes/keys.ts";
4
4
  import { contract } from "@shivaedev/contract/contract.ts";
5
5
  import { command, query } from "@shivaedev/contract/operation.ts";
@@ -13,7 +13,7 @@ import { LastRoleAssigner, UserList, UserListInput } from "#users/roles.ts";
13
13
  const users = collection("admin.users", Schema.String);
14
14
 
15
15
  export const UsersList = Schema.Struct({ ...UserList.fields, canChangeRoles: Schema.Boolean });
16
- export function usersPage<const TRole extends string>(access: Pick<ReturnType<typeof roleSet<TRole>>, "Role">) {
16
+ export function usersPage<const TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role">) {
17
17
  return adminPage({
18
18
  contract: contract("admin.users", {
19
19
  commands: [
@@ -1,7 +1,7 @@
1
1
  import { Schema } from "effect";
2
2
 
3
3
  export const AppUser = Schema.Struct({
4
- createdAt: Schema.DateTimeUtcFromString,
4
+ createdAt: Schema.DateTimeUtcFromDate,
5
5
  email: Schema.String,
6
6
  id: Schema.String,
7
7
  name: Schema.String,