@webiny/api-core 0.0.0-unstable.81ae05e56b → 0.0.0-unstable.a4f3e4ea8b

package/features/users/UpdateUser/feature.js

@@ -1,10 +1,11 @@
 import { createFeature } from "@webiny/feature/api";
 import { UpdateUserUseCase } from "./UpdateUserUseCase.js";
-export const UpdateUserFeature = createFeature({
-  name: "UpdateUser",
-  register(container) {
-    container.register(UpdateUserUseCase);
-  }
+const UpdateUserFeature = createFeature({
+    name: "UpdateUser",
+    register (container) {
+        container.register(UpdateUserUseCase);
+    }
 });
+export { UpdateUserFeature };
 
 //# sourceMappingURL=feature.js.map

package/features/users/UpdateUser/feature.js.map

@@ -1 +1 @@
-{"version":3,"names":["createFeature","UpdateUserUseCase","UpdateUserFeature","name","register","container"],"sources":["feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { UpdateUserUseCase } from \"./UpdateUserUseCase.js\";\n\nexport const UpdateUserFeature = createFeature({\n    name: \"UpdateUser\",\n    register(container) {\n        container.register(UpdateUserUseCase);\n    }\n});\n"],"mappings":"AAAA,SAASA,aAAa,QAAQ,qBAAqB;AACnD,SAASC,iBAAiB;AAE1B,OAAO,MAAMC,iBAAiB,GAAGF,aAAa,CAAC;EAC3CG,IAAI,EAAE,YAAY;EAClBC,QAAQA,CAACC,SAAS,EAAE;IAChBA,SAAS,CAACD,QAAQ,CAACH,iBAAiB,CAAC;EACzC;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"features/users/UpdateUser/feature.js","sources":["../../../../src/features/users/UpdateUser/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { UpdateUserUseCase } from \"./UpdateUserUseCase.js\";\n\nexport const UpdateUserFeature = createFeature({\n    name: \"UpdateUser\",\n    register(container) {\n        container.register(UpdateUserUseCase);\n    }\n});\n"],"names":["UpdateUserFeature","createFeature","container","UpdateUserUseCase"],"mappings":";;AAGO,MAAMA,oBAAoBC,cAAc;IAC3C,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;IACvB;AACJ"}

package/features/users/UpdateUser/index.js

@@ -1,4 +1,2 @@
 export * from "./abstractions.js";
 export * from "./events.js";
-
-//# sourceMappingURL=index.js.map

package/features/users/UpdateUser/schema.js

@@ -1,14 +1,15 @@
 import { z } from "zod";
-export const updateUserValidation = z.object({
-  displayName: z.string().min(1).optional(),
-  firstName: z.string().optional(),
-  lastName: z.string().optional(),
-  avatar: z.object({
-    id: z.string().min(1),
-    src: z.string().url()
-  }).optional().nullable(),
-  roles: z.array(z.string()).optional(),
-  teams: z.array(z.string()).optional()
+const updateUserValidation = z.object({
+    displayName: z.string().min(1).optional(),
+    firstName: z.string().optional(),
+    lastName: z.string().optional(),
+    avatar: z.object({
+        id: z.string().min(1),
+        src: z.string().url()
+    }).optional().nullable(),
+    roles: z.array(z.string()).optional(),
+    teams: z.array(z.string()).optional()
 });
+export { updateUserValidation };
 
 //# sourceMappingURL=schema.js.map

package/features/users/UpdateUser/schema.js.map

@@ -1 +1 @@
-{"version":3,"names":["z","updateUserValidation","object","displayName","string","min","optional","firstName","lastName","avatar","id","src","url","nullable","roles","array","teams"],"sources":["schema.ts"],"sourcesContent":["import { z } from \"zod\";\n\nexport const updateUserValidation = z.object({\n    displayName: z.string().min(1).optional(),\n    firstName: z.string().optional(),\n    lastName: z.string().optional(),\n    avatar: z\n        .object({\n            id: z.string().min(1),\n            src: z.string().url()\n        })\n        .optional()\n        .nullable(),\n    roles: z.array(z.string()).optional(),\n    teams: z.array(z.string()).optional()\n});\n"],"mappings":"AAAA,SAASA,CAAC,QAAQ,KAAK;AAEvB,OAAO,MAAMC,oBAAoB,GAAGD,CAAC,CAACE,MAAM,CAAC;EACzCC,WAAW,EAAEH,CAAC,CAACI,MAAM,CAAC,CAAC,CAACC,GAAG,CAAC,CAAC,CAAC,CAACC,QAAQ,CAAC,CAAC;EACzCC,SAAS,EAAEP,CAAC,CAACI,MAAM,CAAC,CAAC,CAACE,QAAQ,CAAC,CAAC;EAChCE,QAAQ,EAAER,CAAC,CAACI,MAAM,CAAC,CAAC,CAACE,QAAQ,CAAC,CAAC;EAC/BG,MAAM,EAAET,CAAC,CACJE,MAAM,CAAC;IACJQ,EAAE,EAAEV,CAAC,CAACI,MAAM,CAAC,CAAC,CAACC,GAAG,CAAC,CAAC,CAAC;IACrBM,GAAG,EAAEX,CAAC,CAACI,MAAM,CAAC,CAAC,CAACQ,GAAG,CAAC;EACxB,CAAC,CAAC,CACDN,QAAQ,CAAC,CAAC,CACVO,QAAQ,CAAC,CAAC;EACfC,KAAK,EAAEd,CAAC,CAACe,KAAK,CAACf,CAAC,CAACI,MAAM,CAAC,CAAC,CAAC,CAACE,QAAQ,CAAC,CAAC;EACrCU,KAAK,EAAEhB,CAAC,CAACe,KAAK,CAACf,CAAC,CAACI,MAAM,CAAC,CAAC,CAAC,CAACE,QAAQ,CAAC;AACxC,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"features/users/UpdateUser/schema.js","sources":["../../../../src/features/users/UpdateUser/schema.ts"],"sourcesContent":["import { z } from \"zod\";\n\nexport const updateUserValidation = z.object({\n    displayName: z.string().min(1).optional(),\n    firstName: z.string().optional(),\n    lastName: z.string().optional(),\n    avatar: z\n        .object({\n            id: z.string().min(1),\n            src: z.string().url()\n        })\n        .optional()\n        .nullable(),\n    roles: z.array(z.string()).optional(),\n    teams: z.array(z.string()).optional()\n});\n"],"names":["updateUserValidation","z"],"mappings":";AAEO,MAAMA,uBAAuBC,EAAE,MAAM,CAAC;IACzC,aAAaA,EAAE,MAAM,GAAG,GAAG,CAAC,GAAG,QAAQ;IACvC,WAAWA,EAAE,MAAM,GAAG,QAAQ;IAC9B,UAAUA,EAAE,MAAM,GAAG,QAAQ;IAC7B,QAAQA,EAAAA,MACG,CAAC;QACJ,IAAIA,EAAE,MAAM,GAAG,GAAG,CAAC;QACnB,KAAKA,EAAE,MAAM,GAAG,GAAG;IACvB,GACC,QAAQ,GACR,QAAQ;IACb,OAAOA,EAAE,KAAK,CAACA,EAAE,MAAM,IAAI,QAAQ;IACnC,OAAOA,EAAE,KAAK,CAACA,EAAE,MAAM,IAAI,QAAQ;AACvC"}

package/features/users/shared/AdminUsersRepository.js

@@ -1,129 +1,121 @@
-import { createImplementation } from "@webiny/feature/api";
-import { Result } from "@webiny/feature/api";
+import { Result, createImplementation } from "@webiny/feature/api";
 import { TenantContext } from "../../tenancy/TenantContext/index.js";
-import { AdminUsersRepository as RepositoryAbstraction } from "./abstractions.js";
+import { AdminUsersRepository } from "./abstractions.js";
 import { AdminUsersStorageOperations } from "./storageAbstractions.js";
 import { createUserLoaders } from "./loaders.js";
 import { UserNotFoundError, UserStorageError } from "./errors.js";
 class AdminUsersRepositoryImpl {
-  constructor(tenantContext, storageOperations) {
-    this.tenantContext = tenantContext;
-    this.storageOperations = storageOperations;
-    // Initialize DataLoaders using existing implementation
-    this.loaders = createUserLoaders({
-      getTenant: () => this.tenantContext.getTenant().id,
-      storageOperations: this.storageOperations
-    });
-  }
-  async get(params) {
-    try {
-      const tenant = this.tenantContext.getTenant().id;
-
-      // Use DataLoader for ID-based queries (majority of queries)
-      if (params.id) {
-        const user = await this.loaders.getUser.load({
-          tenant,
-          id: params.id
+    constructor(tenantContext, storageOperations){
+        this.tenantContext = tenantContext;
+        this.storageOperations = storageOperations;
+        this.loaders = createUserLoaders({
+            getTenant: ()=>this.tenantContext.getTenant().id,
+            storageOperations: this.storageOperations
         });
-        if (!user) {
-          return Result.fail(new UserNotFoundError(params.id));
+    }
+    async get(params) {
+        try {
+            const tenant = this.tenantContext.getTenant().id;
+            if (params.id) {
+                const user = await this.loaders.getUser.load({
+                    tenant,
+                    id: params.id
+                });
+                if (!user) return Result.fail(new UserNotFoundError(params.id));
+                return Result.ok(user);
+            }
+            if (params.email) {
+                const user = await this.storageOperations.getUser({
+                    where: {
+                        tenant,
+                        email: params.email
+                    }
+                });
+                if (!user) return Result.fail(new UserNotFoundError(params.email));
+                return Result.ok(user);
+            }
+            return Result.fail(new UserNotFoundError("unknown"));
+        } catch (error) {
+            return Result.fail(new UserStorageError(error));
         }
-        return Result.ok(user);
-      }
-
-      // Direct query for email-based lookups (rare)
-      if (params.email) {
-        const user = await this.storageOperations.getUser({
-          where: {
-            tenant,
-            email: params.email
-          }
-        });
-        if (!user) {
-          return Result.fail(new UserNotFoundError(params.email));
+    }
+    async list(params) {
+        try {
+            const tenant = this.tenantContext.getTenant().id;
+            const users = await this.storageOperations.listUsers({
+                where: {
+                    tenant,
+                    ...params.where
+                },
+                sort: params.sort || [
+                    "createdOn_ASC"
+                ]
+            });
+            return Result.ok(users);
+        } catch (error) {
+            return Result.fail(new UserStorageError(error));
         }
-        return Result.ok(user);
-      }
-      return Result.fail(new UserNotFoundError("unknown"));
-    } catch (error) {
-      return Result.fail(new UserStorageError(error));
     }
-  }
-  async list(params) {
-    try {
-      const tenant = this.tenantContext.getTenant().id;
-      const users = await this.storageOperations.listUsers({
-        where: {
-          tenant,
-          ...params.where
-        },
-        sort: params.sort || ["createdOn_ASC"]
-      });
-      return Result.ok(users);
-    } catch (error) {
-      return Result.fail(new UserStorageError(error));
+    async create(user) {
+        try {
+            const result = await this.storageOperations.createUser({
+                user
+            });
+            const tenant = this.tenantContext.getTenant().id;
+            const key = {
+                tenant,
+                id: result.id
+            };
+            this.loaders.getUser.clear(key).prime(key, result);
+            return Result.ok(result);
+        } catch (error) {
+            return Result.fail(new UserStorageError(error));
+        }
     }
-  }
-  async create(user) {
-    try {
-      const result = await this.storageOperations.createUser({
-        user
-      });
-
-      // Prime the cache with the new user
-      const tenant = this.tenantContext.getTenant().id;
-      const key = {
-        tenant,
-        id: result.id
-      };
-      this.loaders.getUser.clear(key).prime(key, result);
-      return Result.ok(result);
-    } catch (error) {
-      return Result.fail(new UserStorageError(error));
+    async update(user) {
+        try {
+            await this.storageOperations.updateUser({
+                user
+            });
+            const tenant = this.tenantContext.getTenant().id;
+            await this.loaders.updateDataLoaderUserCache({
+                tenant,
+                id: user.id
+            }, user);
+            return Result.ok(user);
+        } catch (error) {
+            return Result.fail(new UserStorageError(error));
+        }
     }
-  }
-  async update(user) {
-    try {
-      await this.storageOperations.updateUser({
-        user
-      });
-
-      // Update the cache
-      const tenant = this.tenantContext.getTenant().id;
-      await this.loaders.updateDataLoaderUserCache({
-        tenant,
-        id: user.id
-      }, user);
-      return Result.ok(user);
-    } catch (error) {
-      return Result.fail(new UserStorageError(error));
+    async delete(user) {
+        try {
+            await this.storageOperations.deleteUser({
+                user
+            });
+            const tenant = this.tenantContext.getTenant().id;
+            this.clearCache([
+                {
+                    tenant,
+                    id: user.id
+                }
+            ]);
+            return Result.ok();
+        } catch (error) {
+            return Result.fail(new UserStorageError(error));
+        }
     }
-  }
-  async delete(user) {
-    try {
-      await this.storageOperations.deleteUser({
-        user
-      });
-
-      // Clear from cache
-      const tenant = this.tenantContext.getTenant().id;
-      this.clearCache([{
-        tenant,
-        id: user.id
-      }]);
-      return Result.ok();
-    } catch (error) {
-      return Result.fail(new UserStorageError(error));
+    clearCache(keys) {
+        this.loaders.clearLoadersCache(keys);
     }
-  }
-  clearCache(keys) {
-    this.loaders.clearLoadersCache(keys);
-  }
 }
-export const AdminUsersRepository = createImplementation({
-  abstraction: RepositoryAbstraction,
-  implementation: AdminUsersRepositoryImpl,
-  dependencies: [TenantContext, AdminUsersStorageOperations]
+const AdminUsersRepository_AdminUsersRepository = createImplementation({
+    abstraction: AdminUsersRepository,
+    implementation: AdminUsersRepositoryImpl,
+    dependencies: [
+        TenantContext,
+        AdminUsersStorageOperations
+    ]
 });
+export { AdminUsersRepository_AdminUsersRepository as AdminUsersRepository };
 
 //# sourceMappingURL=AdminUsersRepository.js.map

package/features/users/shared/AdminUsersRepository.js.map

@@ -1 +1 @@
-{"version":3,"names":["createImplementation","Result","TenantContext","AdminUsersRepository","RepositoryAbstraction","AdminUsersStorageOperations","createUserLoaders","UserNotFoundError","UserStorageError","AdminUsersRepositoryImpl","constructor","tenantContext","storageOperations","loaders","getTenant","id","get","params","tenant","user","getUser","load","fail","ok","email","where","error","list","users","listUsers","sort","create","result","createUser","key","clear","prime","update","updateUser","updateDataLoaderUserCache","delete","deleteUser","clearCache","keys","clearLoadersCache","abstraction","implementation","dependencies"],"sources":["AdminUsersRepository.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport { TenantContext } from \"~/features/tenancy/TenantContext/index.js\";\nimport { AdminUsersRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { AdminUsersStorageOperations } from \"./storageAbstractions.js\";\nimport { createUserLoaders } from \"./loaders.js\";\nimport { UserNotFoundError, UserStorageError } from \"./errors.js\";\nimport type { AdminUser } from \"./types.js\";\nimport type { GetUserInput, ListUsersInput } from \"./types.js\";\n\nclass AdminUsersRepositoryImpl implements RepositoryAbstraction.Interface {\n    private loaders: ReturnType<typeof createUserLoaders>;\n\n    constructor(\n        private tenantContext: TenantContext.Interface,\n        private storageOperations: AdminUsersStorageOperations.Interface\n    ) {\n        // Initialize DataLoaders using existing implementation\n        this.loaders = createUserLoaders({\n            getTenant: () => this.tenantContext.getTenant().id,\n            storageOperations: this.storageOperations\n        });\n    }\n\n    async get(params: GetUserInput): Promise<Result<AdminUser, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant().id;\n\n            // Use DataLoader for ID-based queries (majority of queries)\n            if (params.id) {\n                const user = await this.loaders.getUser.load({\n                    tenant,\n                    id: params.id\n                });\n\n                if (!user) {\n                    return Result.fail(new UserNotFoundError(params.id));\n                }\n\n                return Result.ok(user);\n            }\n\n            // Direct query for email-based lookups (rare)\n            if (params.email) {\n                const user = await this.storageOperations.getUser({\n                    where: { tenant, email: params.email }\n                });\n\n                if (!user) {\n                    return Result.fail(new UserNotFoundError(params.email));\n                }\n\n                return Result.ok(user);\n            }\n\n            return Result.fail(new UserNotFoundError(\"unknown\"));\n        } catch (error) {\n            return Result.fail(new UserStorageError(error as Error));\n        }\n    }\n\n    async list(params: ListUsersInput): Promise<Result<AdminUser[], RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant().id;\n            const users = await this.storageOperations.listUsers({\n                where: { tenant, ...params.where },\n                sort: params.sort || [\"createdOn_ASC\"]\n            });\n\n            return Result.ok(users);\n        } catch (error) {\n            return Result.fail(new UserStorageError(error as Error));\n        }\n    }\n\n    async create(user: AdminUser): Promise<Result<AdminUser, RepositoryAbstraction.Error>> {\n        try {\n            const result = await this.storageOperations.createUser({ user });\n\n            // Prime the cache with the new user\n            const tenant = this.tenantContext.getTenant().id;\n            const key = { tenant, id: result.id };\n            this.loaders.getUser.clear(key).prime(key, result);\n\n            return Result.ok(result);\n        } catch (error) {\n            return Result.fail(new UserStorageError(error as Error));\n        }\n    }\n\n    async update(user: AdminUser): Promise<Result<AdminUser, RepositoryAbstraction.Error>> {\n        try {\n            await this.storageOperations.updateUser({ user });\n\n            // Update the cache\n            const tenant = this.tenantContext.getTenant().id;\n            await this.loaders.updateDataLoaderUserCache({ tenant, id: user.id }, user);\n\n            return Result.ok(user);\n        } catch (error) {\n            return Result.fail(new UserStorageError(error as Error));\n        }\n    }\n\n    async delete(user: AdminUser): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            await this.storageOperations.deleteUser({ user });\n\n            // Clear from cache\n            const tenant = this.tenantContext.getTenant().id;\n            this.clearCache([{ tenant, id: user.id }]);\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new UserStorageError(error as Error));\n        }\n    }\n\n    clearCache(keys: Array<{ tenant: string; id: string }>): void {\n        this.loaders.clearLoadersCache(keys);\n    }\n}\n\nexport const AdminUsersRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: AdminUsersRepositoryImpl,\n    dependencies: [TenantContext, AdminUsersStorageOperations]\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"features/users/shared/AdminUsersRepository.js","sources":["../../../../src/features/users/shared/AdminUsersRepository.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport { TenantContext } from \"~/features/tenancy/TenantContext/index.js\";\nimport { AdminUsersRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { AdminUsersStorageOperations } from \"./storageAbstractions.js\";\nimport { createUserLoaders } from \"./loaders.js\";\nimport { UserNotFoundError, UserStorageError } from \"./errors.js\";\nimport type { AdminUser } from \"./types.js\";\nimport type { GetUserInput, ListUsersInput } from \"./types.js\";\n\nclass AdminUsersRepositoryImpl implements RepositoryAbstraction.Interface {\n    private loaders: ReturnType<typeof createUserLoaders>;\n\n    constructor(\n        private tenantContext: TenantContext.Interface,\n        private storageOperations: AdminUsersStorageOperations.Interface\n    ) {\n        // Initialize DataLoaders using existing implementation\n        this.loaders = createUserLoaders({\n            getTenant: () => this.tenantContext.getTenant().id,\n            storageOperations: this.storageOperations\n        });\n    }\n\n    async get(params: GetUserInput): Promise<Result<AdminUser, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant().id;\n\n            // Use DataLoader for ID-based queries (majority of queries)\n            if (params.id) {\n                const user = await this.loaders.getUser.load({\n                    tenant,\n                    id: params.id\n                });\n\n                if (!user) {\n                    return Result.fail(new UserNotFoundError(params.id));\n                }\n\n                return Result.ok(user);\n            }\n\n            // Direct query for email-based lookups (rare)\n            if (params.email) {\n                const user = await this.storageOperations.getUser({\n                    where: { tenant, email: params.email }\n                });\n\n                if (!user) {\n                    return Result.fail(new UserNotFoundError(params.email));\n                }\n\n                return Result.ok(user);\n            }\n\n            return Result.fail(new UserNotFoundError(\"unknown\"));\n        } catch (error) {\n            return Result.fail(new UserStorageError(error as Error));\n        }\n    }\n\n    async list(params: ListUsersInput): Promise<Result<AdminUser[], RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant().id;\n            const users = await this.storageOperations.listUsers({\n                where: { tenant, ...params.where },\n                sort: params.sort || [\"createdOn_ASC\"]\n            });\n\n            return Result.ok(users);\n        } catch (error) {\n            return Result.fail(new UserStorageError(error as Error));\n        }\n    }\n\n    async create(user: AdminUser): Promise<Result<AdminUser, RepositoryAbstraction.Error>> {\n        try {\n            const result = await this.storageOperations.createUser({ user });\n\n            // Prime the cache with the new user\n            const tenant = this.tenantContext.getTenant().id;\n            const key = { tenant, id: result.id };\n            this.loaders.getUser.clear(key).prime(key, result);\n\n            return Result.ok(result);\n        } catch (error) {\n            return Result.fail(new UserStorageError(error as Error));\n        }\n    }\n\n    async update(user: AdminUser): Promise<Result<AdminUser, RepositoryAbstraction.Error>> {\n        try {\n            await this.storageOperations.updateUser({ user });\n\n            // Update the cache\n            const tenant = this.tenantContext.getTenant().id;\n            await this.loaders.updateDataLoaderUserCache({ tenant, id: user.id }, user);\n\n            return Result.ok(user);\n        } catch (error) {\n            return Result.fail(new UserStorageError(error as Error));\n        }\n    }\n\n    async delete(user: AdminUser): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            await this.storageOperations.deleteUser({ user });\n\n            // Clear from cache\n            const tenant = this.tenantContext.getTenant().id;\n            this.clearCache([{ tenant, id: user.id }]);\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new UserStorageError(error as Error));\n        }\n    }\n\n    clearCache(keys: Array<{ tenant: string; id: string }>): void {\n        this.loaders.clearLoadersCache(keys);\n    }\n}\n\nexport const AdminUsersRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: AdminUsersRepositoryImpl,\n    dependencies: [TenantContext, AdminUsersStorageOperations]\n});\n"],"names":["AdminUsersRepositoryImpl","tenantContext","storageOperations","createUserLoaders","params","tenant","user","Result","UserNotFoundError","error","UserStorageError","users","result","key","keys","AdminUsersRepository","createImplementation","RepositoryAbstraction","TenantContext","AdminUsersStorageOperations"],"mappings":"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"}

package/features/users/shared/abstractions.js

@@ -1,12 +1,5 @@
 import { createAbstraction } from "@webiny/feature/api";
-
-// Repository error interface
-
-// Repository interface
-
-/** Persist and retrieve admin users. */
-export const AdminUsersRepository = createAbstraction("AdminUsersRepository");
-
-// Namespace exports
+const AdminUsersRepository = createAbstraction("AdminUsersRepository");
+export { AdminUsersRepository };
 
 //# sourceMappingURL=abstractions.js.map

package/features/users/shared/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"names":["createAbstraction","AdminUsersRepository"],"sources":["abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport type { AdminUser } from \"~/types/users.js\";\nimport type { GetUserInput, ListUsersInput } from \"./types.js\";\nimport { UserNotFoundError, UserStorageError } from \"./errors.js\";\n\n// Repository error interface\nexport interface IAdminUsersRepositoryErrors {\n    base: UserNotFoundError | UserStorageError;\n}\n\nexport type RepositoryError = IAdminUsersRepositoryErrors[keyof IAdminUsersRepositoryErrors];\n\n// Repository interface\nexport interface IAdminUsersRepository {\n    get(params: GetUserInput): Promise<Result<AdminUser, RepositoryError>>;\n    list(params: ListUsersInput): Promise<Result<AdminUser[], RepositoryError>>;\n    create(user: AdminUser): Promise<Result<AdminUser, RepositoryError>>;\n    update(user: AdminUser): Promise<Result<AdminUser, RepositoryError>>;\n    delete(user: AdminUser): Promise<Result<void, RepositoryError>>;\n    clearCache(keys: Array<{ tenant: string; id: string }>): void;\n}\n\n/** Persist and retrieve admin users. */\nexport const AdminUsersRepository =\n    createAbstraction<IAdminUsersRepository>(\"AdminUsersRepository\");\n\n// Namespace exports\nexport namespace AdminUsersRepository {\n    export type Interface = IAdminUsersRepository;\n    export type Error = RepositoryError;\n}\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,qBAAqB;;AAMvD;;AAOA;;AAUA;AACA,OAAO,MAAMC,oBAAoB,GAC7BD,iBAAiB,CAAwB,sBAAsB,CAAC;;AAEpE","ignoreList":[]}
+{"version":3,"file":"features/users/shared/abstractions.js","sources":["../../../../src/features/users/shared/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport type { AdminUser } from \"~/types/users.js\";\nimport type { GetUserInput, ListUsersInput } from \"./types.js\";\nimport { UserNotFoundError, UserStorageError } from \"./errors.js\";\n\n// Repository error interface\nexport interface IAdminUsersRepositoryErrors {\n    base: UserNotFoundError | UserStorageError;\n}\n\nexport type RepositoryError = IAdminUsersRepositoryErrors[keyof IAdminUsersRepositoryErrors];\n\n// Repository interface\nexport interface IAdminUsersRepository {\n    get(params: GetUserInput): Promise<Result<AdminUser, RepositoryError>>;\n    list(params: ListUsersInput): Promise<Result<AdminUser[], RepositoryError>>;\n    create(user: AdminUser): Promise<Result<AdminUser, RepositoryError>>;\n    update(user: AdminUser): Promise<Result<AdminUser, RepositoryError>>;\n    delete(user: AdminUser): Promise<Result<void, RepositoryError>>;\n    clearCache(keys: Array<{ tenant: string; id: string }>): void;\n}\n\n/** Persist and retrieve admin users. */\nexport const AdminUsersRepository =\n    createAbstraction<IAdminUsersRepository>(\"AdminUsersRepository\");\n\n// Namespace exports\nexport namespace AdminUsersRepository {\n    export type Interface = IAdminUsersRepository;\n    export type Error = RepositoryError;\n}\n"],"names":["AdminUsersRepository","createAbstraction"],"mappings":";AAwBO,MAAMA,uBACTC,kBAAyC"}

package/features/users/shared/errors.js

@@ -1,54 +1,48 @@
 import { BaseError } from "@webiny/feature/api";
-export class UserStorageError extends BaseError {
-  code = "AdminUser/Persistence";
-  constructor(error) {
-    super({
-      message: error.message
-    });
-  }
+class UserStorageError extends BaseError {
+    constructor(error){
+        super({
+            message: error.message
+        }), this.code = "AdminUser/Persistence";
+    }
 }
-export class UserNotFoundError extends BaseError {
-  code = "AdminUser/NotFound";
-  constructor(id) {
-    super({
-      message: `User "${id}" was not found!`,
-      data: {
-        id
-      }
-    });
-  }
+class UserNotFoundError extends BaseError {
+    constructor(id){
+        super({
+            message: `User "${id}" was not found!`,
+            data: {
+                id
+            }
+        }), this.code = "AdminUser/NotFound";
+    }
 }
-export class EmailTakenError extends BaseError {
-  code = "AdminUser/EmailTaken";
-  constructor(email) {
-    super({
-      message: `User with email "${email}" already exists.`,
-      data: {
-        email
-      }
-    });
-  }
+class EmailTakenError extends BaseError {
+    constructor(email){
+        super({
+            message: `User with email "${email}" already exists.`,
+            data: {
+                email
+            }
+        }), this.code = "AdminUser/EmailTaken";
+    }
 }
-export class UserValidationError extends BaseError {
-  code = "AdminUser/Validation";
-  constructor(message) {
-    super({
-      message,
-      data: {
-        message
-      }
-    });
-  }
+class UserValidationError extends BaseError {
+    constructor(message){
+        super({
+            message,
+            data: {
+                message
+            }
+        }), this.code = "AdminUser/Validation";
+    }
 }
-
-// Authorization error
-export class NotAuthorizedError extends BaseError {
-  code = "AdminUser/NotAuthorized";
-  constructor(message) {
-    super({
-      message: message || "Not authorized!"
-    });
-  }
+class NotAuthorizedError extends BaseError {
+    constructor(message){
+        super({
+            message: message || "Not authorized!"
+        }), this.code = "AdminUser/NotAuthorized";
+    }
 }
+export { EmailTakenError, NotAuthorizedError, UserNotFoundError, UserStorageError, UserValidationError };
 
 //# sourceMappingURL=errors.js.map

package/features/users/shared/errors.js.map

@@ -1 +1 @@
-{"version":3,"names":["BaseError","UserStorageError","code","constructor","error","message","UserNotFoundError","id","data","EmailTakenError","email","UserValidationError","NotAuthorizedError"],"sources":["errors.ts"],"sourcesContent":["import { BaseError } from \"@webiny/feature/api\";\n\nexport class UserStorageError extends BaseError {\n    override readonly code = \"AdminUser/Persistence\" as const;\n\n    constructor(error: Error) {\n        super({\n            message: error.message\n        });\n    }\n}\n\nexport class UserNotFoundError extends BaseError<{ id: string }> {\n    override readonly code = \"AdminUser/NotFound\" as const;\n\n    constructor(id: string) {\n        super({\n            message: `User \"${id}\" was not found!`,\n            data: { id }\n        });\n    }\n}\n\nexport class EmailTakenError extends BaseError<{ email: string }> {\n    override readonly code = \"AdminUser/EmailTaken\" as const;\n\n    constructor(email: string) {\n        super({\n            message: `User with email \"${email}\" already exists.`,\n            data: { email }\n        });\n    }\n}\n\nexport class UserValidationError extends BaseError<{ message: string }> {\n    override readonly code = \"AdminUser/Validation\" as const;\n\n    constructor(message: string) {\n        super({\n            message,\n            data: { message }\n        });\n    }\n}\n\n// Authorization error\nexport class NotAuthorizedError extends BaseError {\n    override readonly code = \"AdminUser/NotAuthorized\" as const;\n\n    constructor(message?: string) {\n        super({\n            message: message || \"Not authorized!\"\n        });\n    }\n}\n"],"mappings":"AAAA,SAASA,SAAS,QAAQ,qBAAqB;AAE/C,OAAO,MAAMC,gBAAgB,SAASD,SAAS,CAAC;EAC1BE,IAAI,GAAG,uBAAuB;EAEhDC,WAAWA,CAACC,KAAY,EAAE;IACtB,KAAK,CAAC;MACFC,OAAO,EAAED,KAAK,CAACC;IACnB,CAAC,CAAC;EACN;AACJ;AAEA,OAAO,MAAMC,iBAAiB,SAASN,SAAS,CAAiB;EAC3CE,IAAI,GAAG,oBAAoB;EAE7CC,WAAWA,CAACI,EAAU,EAAE;IACpB,KAAK,CAAC;MACFF,OAAO,EAAE,SAASE,EAAE,kBAAkB;MACtCC,IAAI,EAAE;QAAED;MAAG;IACf,CAAC,CAAC;EACN;AACJ;AAEA,OAAO,MAAME,eAAe,SAAST,SAAS,CAAoB;EAC5CE,IAAI,GAAG,sBAAsB;EAE/CC,WAAWA,CAACO,KAAa,EAAE;IACvB,KAAK,CAAC;MACFL,OAAO,EAAE,oBAAoBK,KAAK,mBAAmB;MACrDF,IAAI,EAAE;QAAEE;MAAM;IAClB,CAAC,CAAC;EACN;AACJ;AAEA,OAAO,MAAMC,mBAAmB,SAASX,SAAS,CAAsB;EAClDE,IAAI,GAAG,sBAAsB;EAE/CC,WAAWA,CAACE,OAAe,EAAE;IACzB,KAAK,CAAC;MACFA,OAAO;MACPG,IAAI,EAAE;QAAEH;MAAQ;IACpB,CAAC,CAAC;EACN;AACJ;;AAEA;AACA,OAAO,MAAMO,kBAAkB,SAASZ,SAAS,CAAC;EAC5BE,IAAI,GAAG,yBAAyB;EAElDC,WAAWA,CAACE,OAAgB,EAAE;IAC1B,KAAK,CAAC;MACFA,OAAO,EAAEA,OAAO,IAAI;IACxB,CAAC,CAAC;EACN;AACJ","ignoreList":[]}
+{"version":3,"file":"features/users/shared/errors.js","sources":["../../../../src/features/users/shared/errors.ts"],"sourcesContent":["import { BaseError } from \"@webiny/feature/api\";\n\nexport class UserStorageError extends BaseError {\n    override readonly code = \"AdminUser/Persistence\" as const;\n\n    constructor(error: Error) {\n        super({\n            message: error.message\n        });\n    }\n}\n\nexport class UserNotFoundError extends BaseError<{ id: string }> {\n    override readonly code = \"AdminUser/NotFound\" as const;\n\n    constructor(id: string) {\n        super({\n            message: `User \"${id}\" was not found!`,\n            data: { id }\n        });\n    }\n}\n\nexport class EmailTakenError extends BaseError<{ email: string }> {\n    override readonly code = \"AdminUser/EmailTaken\" as const;\n\n    constructor(email: string) {\n        super({\n            message: `User with email \"${email}\" already exists.`,\n            data: { email }\n        });\n    }\n}\n\nexport class UserValidationError extends BaseError<{ message: string }> {\n    override readonly code = \"AdminUser/Validation\" as const;\n\n    constructor(message: string) {\n        super({\n            message,\n            data: { message }\n        });\n    }\n}\n\n// Authorization error\nexport class NotAuthorizedError extends BaseError {\n    override readonly code = \"AdminUser/NotAuthorized\" as const;\n\n    constructor(message?: string) {\n        super({\n            message: message || \"Not authorized!\"\n        });\n    }\n}\n"],"names":["UserStorageError","BaseError","error","UserNotFoundError","id","EmailTakenError","email","UserValidationError","message","NotAuthorizedError"],"mappings":";AAEO,MAAMA,yBAAyBC;IAGlC,YAAYC,KAAY,CAAE;QACtB,KAAK,CAAC;YACF,SAASA,MAAM,OAAO;QAC1B,SALc,IAAI,GAAG;IAMzB;AACJ;AAEO,MAAMC,0BAA0BF;IAGnC,YAAYG,EAAU,CAAE;QACpB,KAAK,CAAC;YACF,SAAS,CAAC,MAAM,EAAEA,GAAG,gBAAgB,CAAC;YACtC,MAAM;gBAAEA;YAAG;QACf,SANc,IAAI,GAAG;IAOzB;AACJ;AAEO,MAAMC,wBAAwBJ;IAGjC,YAAYK,KAAa,CAAE;QACvB,KAAK,CAAC;YACF,SAAS,CAAC,iBAAiB,EAAEA,MAAM,iBAAiB,CAAC;YACrD,MAAM;gBAAEA;YAAM;QAClB,SANc,IAAI,GAAG;IAOzB;AACJ;AAEO,MAAMC,4BAA4BN;IAGrC,YAAYO,OAAe,CAAE;QACzB,KAAK,CAAC;YACFA;YACA,MAAM;gBAAEA;YAAQ;QACpB,SANc,IAAI,GAAG;IAOzB;AACJ;AAGO,MAAMC,2BAA2BR;IAGpC,YAAYO,OAAgB,CAAE;QAC1B,KAAK,CAAC;YACF,SAASA,WAAW;QACxB,SALc,IAAI,GAAG;IAMzB;AACJ"}

package/features/users/shared/loaders.js

@@ -1,73 +1,59 @@
-import DataLoader from "dataloader";
-import WebinyError from "@webiny/error";
+import dataloader from "dataloader";
+import error from "@webiny/error";
 import flatten from "lodash/flatten.js";
-export const createUserLoaders = ({
-  storageOperations
-}) => {
-  const loaders = new Map();
-  async function getUserLoader(ids) {
-    if (ids.length === 0) {
-      return [];
-    }
-
-    // Group by tenant
-    const byTenant = ids.reduce((acc, item) => {
-      acc[item.tenant] = [...(acc[item.tenant] || []), item.id];
-      return acc;
-    }, {});
-    try {
-      const results = await Promise.all(Object.keys(byTenant).map(tenant => {
-        return storageOperations.listUsers({
-          where: {
-            tenant,
-            id_in: byTenant[tenant]
-          }
-        });
-      })).then(res => flatten(res));
-      return ids.map(({
-        tenant,
-        id
-      }) => {
-        const user = results.find(item => item.id === id && item.tenant === tenant);
-        /**
-         * Casting because DataLoader expect error. But we do not.
-         */
-        return user || null;
-      });
-    } catch (err) {
-      throw WebinyError.from(err, {
-        message: "Could not execute batch read in getUser.",
-        code: "BATCH_READ_ERROR",
-        data: {
-          ids
+const createUserLoaders = ({ storageOperations })=>{
+    const loaders = new Map();
+    async function getUserLoader(ids) {
+        if (0 === ids.length) return [];
+        const byTenant = ids.reduce((acc, item)=>{
+            acc[item.tenant] = [
+                ...acc[item.tenant] || [],
+                item.id
+            ];
+            return acc;
+        }, {});
+        try {
+            const results = await Promise.all(Object.keys(byTenant).map((tenant)=>storageOperations.listUsers({
+                    where: {
+                        tenant,
+                        id_in: byTenant[tenant]
+                    }
+                }))).then((res)=>flatten(res));
+            return ids.map(({ tenant, id })=>{
+                const user = results.find((item)=>item.id === id && item.tenant === tenant);
+                return user || null;
+            });
+        } catch (err) {
+            throw error.from(err, {
+                message: "Could not execute batch read in getUser.",
+                code: "BATCH_READ_ERROR",
+                data: {
+                    ids
+                }
+            });
         }
-      });
     }
-  }
-  return {
-    get getUser() {
-      let userLoader = loaders.get("getUser");
-      if (userLoader) {
-        return userLoader;
-      }
-      userLoader = new DataLoader(getUserLoader, {
-        cacheKeyFn(key) {
-          return `${key.tenant}:${key.id}`;
+    return {
+        get getUser () {
+            let userLoader = loaders.get("getUser");
+            if (userLoader) return userLoader;
+            userLoader = new dataloader(getUserLoader, {
+                cacheKeyFn (key) {
+                    return `${key.tenant}:${key.id}`;
+                }
+            });
+            loaders.set("getUser", userLoader);
+            return userLoader;
+        },
+        clearLoadersCache (ids) {
+            for (const id of ids)this.getUser.clear(id);
+        },
+        async updateDataLoaderUserCache (id, data) {
+            const user = await this.getUser.load(id);
+            this.getUser.clear(id).prime(id, Object.assign({}, user, data));
         }
-      });
-      loaders.set("getUser", userLoader);
-      return userLoader;
-    },
-    clearLoadersCache(ids) {
-      for (const id of ids) {
-        this.getUser.clear(id);
-      }
-    },
-    async updateDataLoaderUserCache(id, data) {
-      const user = await this.getUser.load(id);
-      this.getUser.clear(id).prime(id, Object.assign({}, user, data));
-    }
-  };
+    };
 };
+export { createUserLoaders };
 
 //# sourceMappingURL=loaders.js.map