@forklaunch/implementation-iam-base 0.5.8 → 0.6.0

package/lib/services/index.mjs

@@ -1,8 +1,7 @@
 // services/organization.service.ts
 import { evaluateTelemetryOptions } from '@forklaunch/core/http';
-import { transformIntoInternalMapper } from '@forklaunch/internal';
 var BaseOrganizationService = class {
-  _mappers;
+  // protected _mappers: InternalMapper<InstanceTypeRecord<typeof this.mappers>>;
   evaluatedTelemetryOptions;
   em;
   openTelemetryCollector;
@@ -13,7 +12,6 @@ var BaseOrganizationService = class {
     this.openTelemetryCollector = openTelemetryCollector;
     this.schemaValidator = schemaValidator;
     this.mappers = mappers;
-    this._mappers = transformIntoInternalMapper(mappers, schemaValidator);
     this.evaluatedTelemetryOptions = options?.telemetry
       ? evaluateTelemetryOptions(options.telemetry).enabled
       : {
@@ -22,24 +20,24 @@ var BaseOrganizationService = class {
           tracing: false
         };
   }
-  async createOrganization(organizationDto, em) {
+  async createOrganization(organizationDto, em, ...args) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info(
         'Creating organization',
         organizationDto
       );
     }
-    const organization =
-      await this._mappers.CreateOrganizationMapper.deserializeDtoToEntity(
-        organizationDto,
-        em ?? this.em
-      );
+    const organization = await this.mappers.CreateOrganizationMapper.toEntity(
+      organizationDto,
+      em ?? this.em,
+      ...args
+    );
     if (em) {
       await em.persist(organization);
     } else {
       await this.em.persistAndFlush(organization);
     }
-    return this._mappers.OrganizationMapper.serializeEntityToDto(organization);
+    return this.mappers.OrganizationMapper.toDto(organization);
   }
   async getOrganization(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -52,9 +50,9 @@ var BaseOrganizationService = class {
         populate: ['id', '*']
       }
     );
-    return this._mappers.OrganizationMapper.serializeEntityToDto(organization);
+    return this.mappers.OrganizationMapper.toDto(organization);
   }
-  async updateOrganization(organizationDto, em) {
+  async updateOrganization(organizationDto, em, ...args) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info(
         'Updating organization',
@@ -62,18 +60,17 @@ var BaseOrganizationService = class {
       );
     }
     const updatedOrganization =
-      await this._mappers.UpdateOrganizationMapper.deserializeDtoToEntity(
+      await this.mappers.UpdateOrganizationMapper.toEntity(
         organizationDto,
-        em ?? this.em
+        em ?? this.em,
+        ...args
       );
     if (em) {
       await em.persist(updatedOrganization);
     } else {
       await this.em.persistAndFlush(updatedOrganization);
     }
-    return this._mappers.OrganizationMapper.serializeEntityToDto(
-      updatedOrganization
-    );
+    return this.mappers.OrganizationMapper.toDto(updatedOrganization);
   }
   async deleteOrganization(idDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -89,9 +86,7 @@ var BaseOrganizationService = class {
 
 // services/permission.service.ts
 import { evaluateTelemetryOptions as evaluateTelemetryOptions2 } from '@forklaunch/core/http';
-import { transformIntoInternalMapper as transformIntoInternalMapper2 } from '@forklaunch/internal';
 var BasePermissionService = class {
-  _mappers;
   evaluatedTelemetryOptions;
   em;
   roleServiceFactory;
@@ -111,7 +106,6 @@ var BasePermissionService = class {
     this.openTelemetryCollector = openTelemetryCollector;
     this.schemaValidator = schemaValidator;
     this.mappers = mappers;
-    this._mappers = transformIntoInternalMapper2(mappers, schemaValidator);
     this.evaluatedTelemetryOptions = options?.telemetry
       ? evaluateTelemetryOptions2(options.telemetry).enabled
       : {
@@ -145,7 +139,7 @@ var BasePermissionService = class {
           (await this.roleServiceFactory().getBatchRoles(roles, em)).map(
             async (role) => {
               return (em ?? this.em).merge(
-                await this._mappers.RoleEntityMapper.deserializeDtoToEntity(
+                await this.mappers.RoleEntityMapper.toEntity(
                   role,
                   em ?? this.em
                 )
@@ -157,19 +151,20 @@ var BasePermissionService = class {
   }
   // end: global helper functions
   // start: createPermission helper functions
-  async createPermissionDto({ permission, addToRoles }) {
+  async createPermissionEntity({ permission, addToRoles }) {
     let roles = [];
     if (addToRoles) {
       roles = await this.updateRolesWithPermissions(addToRoles, [permission]);
     }
     return { permission, roles };
   }
-  async extractCreatePermissionDtoToEntityData(permissionDto, em) {
+  async extractCreatePermissionEntityToEntityData(permissionDto, em, ...args) {
     return {
       permission: (em ?? this.em).merge(
-        await this._mappers.CreatePermissionMapper.deserializeDtoToEntity(
+        await this.mappers.CreatePermissionMapper.toEntity(
           permissionDto,
-          em ?? this.em
+          em ?? this.em,
+          ...args
         )
       ),
       addToRoles: permissionDto.addToRolesIds
@@ -178,22 +173,26 @@ var BasePermissionService = class {
     };
   }
   // end: createPermission helper functions
-  async createPermission(createPermissionDto, em) {
+  async createPermission(createPermissionEntity, em, ...args) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info(
         'Creating permission',
-        createPermissionDto
+        createPermissionEntity
       );
     }
-    const { permission, roles } = await this.createPermissionDto(
-      await this.extractCreatePermissionDtoToEntityData(createPermissionDto, em)
+    const { permission, roles } = await this.createPermissionEntity(
+      await this.extractCreatePermissionEntityToEntityData(
+        createPermissionEntity,
+        em,
+        ...args
+      )
     );
     if (em) {
       await em.persist([permission, ...roles]);
     } else {
       await this.em.persistAndFlush([permission, ...roles]);
     }
-    return this._mappers.PermissionMapper.serializeEntityToDto(permission);
+    return this.mappers.PermissionMapper.toDto(permission);
   }
   async createBatchPermissions(permissionDtos, em) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -204,13 +203,27 @@ var BasePermissionService = class {
     }
     const rolesCache = {};
     const permissions = [];
-    permissionDtos.map(async (createPermissionDto) => {
-      const { permission, roles } = await this.createPermissionDto(
-        await this.extractCreatePermissionDtoToEntityData(
-          createPermissionDto,
+    permissionDtos.map(async (createPermissionEntity) => {
+      const { permission, roles } = await this.createPermissionEntity(
+        await this.extractCreatePermissionEntityToEntityData(
+          createPermissionEntity,
           em
         )
       );
+      await Promise.all(
+        roles.map(async (role) => {
+          if (role.permissions.isInitialized()) {
+            return role.permissions.init();
+          }
+        })
+      );
+      await Promise.all(
+        roles.map(async (role) => {
+          if (role.permissions.isInitialized()) {
+            return role.permissions.init();
+          }
+        })
+      );
       roles.forEach((role) => {
         if (
           rolesCache[role.id] &&
@@ -235,7 +248,7 @@ var BasePermissionService = class {
     }
     return Promise.all(
       permissions.map(async (permission) =>
-        this._mappers.PermissionMapper.serializeEntityToDto(permission)
+        this.mappers.PermissionMapper.toDto(permission)
       )
     );
   }
@@ -244,7 +257,7 @@ var BasePermissionService = class {
       this.openTelemetryCollector.info('Getting permission', idDto);
     }
     const permission = await (em ?? this.em).findOneOrFail('Permission', idDto);
-    return this._mappers.PermissionMapper.serializeEntityToDto(permission);
+    return this.mappers.PermissionMapper.toDto(permission);
   }
   async getBatchPermissions(idsDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -252,17 +265,17 @@ var BasePermissionService = class {
     }
     return Promise.all(
       (await (em ?? this.em).find('Permission', idsDto)).map((permission) =>
-        this._mappers.PermissionMapper.serializeEntityToDto(permission)
+        this.mappers.PermissionMapper.toDto(permission)
       )
     );
   }
   // start: updatePermission helper functions
-  updatePermissionDto = async (permissionDto, em) => {
-    const permission =
-      await this._mappers.UpdatePermissionMapper.deserializeDtoToEntity(
-        permissionDto,
-        em ?? this.em
-      );
+  updatePermissionDto = async (permissionDto, em, ...args) => {
+    const permission = await this.mappers.UpdatePermissionMapper.toEntity(
+      permissionDto,
+      em ?? this.em,
+      ...args
+    );
     const addToRoles = permissionDto.addToRolesIds
       ? await this.getBatchRoles({ ids: permissionDto.addToRolesIds }, em)
       : [];
@@ -293,7 +306,7 @@ var BasePermissionService = class {
     } else {
       await this.em.persistAndFlush(entities);
     }
-    return this._mappers.PermissionMapper.serializeEntityToDto(permission);
+    return this.mappers.PermissionMapper.toDto(permission);
   }
   async updateBatchPermissions(permissionDtos, em) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -333,7 +346,7 @@ var BasePermissionService = class {
     });
     return Promise.all(
       permissions.map((permission) =>
-        this._mappers.PermissionMapper.serializeEntityToDto(permission)
+        this.mappers.PermissionMapper.toDto(permission)
       )
     );
   }
@@ -355,9 +368,7 @@ var BasePermissionService = class {
 
 // services/role.service.ts
 import { evaluateTelemetryOptions as evaluateTelemetryOptions3 } from '@forklaunch/core/http';
-import { transformIntoInternalMapper as transformIntoInternalMapper3 } from '@forklaunch/internal';
 var BaseRoleService = class {
-  _mappers;
   evaluatedTelemetryOptions;
   em;
   openTelemetryCollector;
@@ -368,7 +379,6 @@ var BaseRoleService = class {
     this.openTelemetryCollector = openTelemetryCollector;
     this.schemaValidator = schemaValidator;
     this.mappers = mappers;
-    this._mappers = transformIntoInternalMapper3(mappers, schemaValidator);
     this.evaluatedTelemetryOptions = options?.telemetry
       ? evaluateTelemetryOptions3(options.telemetry).enabled
       : {
@@ -377,31 +387,29 @@ var BaseRoleService = class {
           tracing: false
         };
   }
-  async createRole(roleDto, em) {
+  async createRole(roleDto, em, ...args) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Creating role', roleDto);
     }
-    const role = await this._mappers.CreateRoleMapper.deserializeDtoToEntity(
+    const role = await this.mappers.CreateRoleMapper.toEntity(
       roleDto,
-      em ?? this.em
+      em ?? this.em,
+      ...args
     );
     if (em) {
       await em.persist(role);
     } else {
       await this.em.persistAndFlush(role);
     }
-    return this._mappers.RoleMapper.serializeEntityToDto(role);
+    return this.mappers.RoleMapper.toDto(role);
   }
-  async createBatchRoles(roleDtos, em) {
+  async createBatchRoles(roleDtos, em, ...args) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Creating batch roles', roleDtos);
     }
     const roles = await Promise.all(
       roleDtos.map(async (roleDto) =>
-        this._mappers.CreateRoleMapper.deserializeDtoToEntity(
-          roleDto,
-          em ?? this.em
-        )
+        this.mappers.CreateRoleMapper.toEntity(roleDto, em ?? this.em, ...args)
       )
     );
     if (em) {
@@ -410,7 +418,7 @@ var BaseRoleService = class {
       await this.em.persistAndFlush(roles);
     }
     return Promise.all(
-      roles.map((role) => this._mappers.RoleMapper.serializeEntityToDto(role))
+      roles.map((role) => this.mappers.RoleMapper.toDto(role))
     );
   }
   async getRole({ id }, em) {
@@ -420,7 +428,7 @@ var BaseRoleService = class {
     const role = await (em ?? this.em).findOneOrFail('Role', id, {
       populate: ['id', '*']
     });
-    return this._mappers.RoleMapper.serializeEntityToDto(role);
+    return this.mappers.RoleMapper.toDto(role);
   }
   async getBatchRoles({ ids }, em) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -437,34 +445,32 @@ var BaseRoleService = class {
             populate: ['id', '*']
           }
         )
-      ).map((role) => this._mappers.RoleMapper.serializeEntityToDto(role))
+      ).map((role) => this.mappers.RoleMapper.toDto(role))
     );
   }
-  async updateRole(roleDto, em) {
+  async updateRole(roleDto, em, ...args) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Updating role', roleDto);
     }
-    const role = await this._mappers.UpdateRoleMapper.deserializeDtoToEntity(
+    const role = await this.mappers.UpdateRoleMapper.toEntity(
       roleDto,
-      em ?? this.em
+      em ?? this.em,
+      ...args
     );
     if (em) {
       await em.persist(role);
     } else {
       await this.em.persistAndFlush(role);
     }
-    return this._mappers.RoleMapper.serializeEntityToDto(role);
+    return this.mappers.RoleMapper.toDto(role);
   }
-  async updateBatchRoles(roleDtos, em) {
+  async updateBatchRoles(roleDtos, em, ...args) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Updating batch roles', roleDtos);
     }
     const roles = await Promise.all(
       roleDtos.map(async (roleDto) =>
-        this._mappers.UpdateRoleMapper.deserializeDtoToEntity(
-          roleDto,
-          em ?? this.em
-        )
+        this.mappers.UpdateRoleMapper.toEntity(roleDto, em ?? this.em, ...args)
       )
     );
     if (em) {
@@ -473,7 +479,7 @@ var BaseRoleService = class {
       await this.em.persistAndFlush(roles);
     }
     return Promise.all(
-      roles.map((role) => this._mappers.RoleMapper.serializeEntityToDto(role))
+      roles.map((role) => this.mappers.RoleMapper.toDto(role))
     );
   }
   async deleteRole(idDto, em) {
@@ -492,8 +498,15 @@ var BaseRoleService = class {
 
 // services/user.service.ts
 import { evaluateTelemetryOptions as evaluateTelemetryOptions4 } from '@forklaunch/core/http';
-import { transformIntoInternalMapper as transformIntoInternalMapper4 } from '@forklaunch/internal';
 var BaseUserService = class {
+  evaluatedTelemetryOptions;
+  em;
+  passwordEncryptionPublicKeyPath;
+  roleServiceFactory;
+  organizationServiceFactory;
+  openTelemetryCollector;
+  schemaValidator;
+  mappers;
   constructor(
     em,
     passwordEncryptionPublicKeyPath,
@@ -504,7 +517,6 @@ var BaseUserService = class {
     mappers,
     options
   ) {
-    this.options = options;
     this.em = em;
     this.passwordEncryptionPublicKeyPath = passwordEncryptionPublicKeyPath;
     this.roleServiceFactory = roleServiceFactory;
@@ -512,7 +524,6 @@ var BaseUserService = class {
     this.openTelemetryCollector = openTelemetryCollector;
     this.schemaValidator = schemaValidator;
     this.mappers = mappers;
-    this._mappers = transformIntoInternalMapper4(mappers, schemaValidator);
     this.evaluatedTelemetryOptions = options?.telemetry
       ? evaluateTelemetryOptions4(options.telemetry).enabled
       : {
@@ -521,39 +532,32 @@ var BaseUserService = class {
           tracing: false
         };
   }
-  _mappers;
-  evaluatedTelemetryOptions;
-  em;
-  passwordEncryptionPublicKeyPath;
-  roleServiceFactory;
-  organizationServiceFactory;
-  openTelemetryCollector;
-  schemaValidator;
-  mappers;
-  async createUser(userDto, em) {
+  async createUser(userDto, em, ...args) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Creating user', userDto);
     }
-    const user = await this._mappers.CreateUserMapper.deserializeDtoToEntity(
+    const user = await this.mappers.CreateUserMapper.toEntity(
       userDto,
-      em ?? this.em
+      em ?? this.em,
+      ...args
     );
     if (em) {
       await em.persist(user);
     } else {
       await this.em.persistAndFlush(user);
     }
-    return this._mappers.UserMapper.serializeEntityToDto(user);
+    return this.mappers.UserMapper.toDto(user);
   }
-  async createBatchUsers(userDtos, em) {
+  async createBatchUsers(userDtos, em, ...args) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Creating batch users', userDtos);
     }
     const users = await Promise.all(
       userDtos.map(async (createUserDto) =>
-        this._mappers.CreateUserMapper.deserializeDtoToEntity(
+        this.mappers.CreateUserMapper.toEntity(
           createUserDto,
-          em ?? this.em
+          em ?? this.em,
+          ...args
         )
       )
     );
@@ -563,7 +567,7 @@ var BaseUserService = class {
       await this.em.persistAndFlush(users);
     }
     return Promise.all(
-      users.map((user) => this._mappers.UserMapper.serializeEntityToDto(user))
+      users.map((user) => this.mappers.UserMapper.toDto(user))
     );
   }
   async getUser(idDto, em) {
@@ -573,7 +577,7 @@ var BaseUserService = class {
     const user = await (em ?? this.em).findOneOrFail('User', idDto, {
       populate: ['id', '*']
     });
-    return this._mappers.UserMapper.serializeEntityToDto(user);
+    return this.mappers.UserMapper.toDto(user);
   }
   async getBatchUsers(idsDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -584,33 +588,35 @@ var BaseUserService = class {
         await (em ?? this.em).find('User', idsDto, {
           populate: ['id', '*']
         })
-      ).map((user) => this._mappers.UserMapper.serializeEntityToDto(user))
+      ).map((user) => this.mappers.UserMapper.toDto(user))
     );
   }
-  async updateUser(userDto, em) {
+  async updateUser(userDto, em, ...args) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Updating user', userDto);
     }
-    const user = await this._mappers.UpdateUserMapper.deserializeDtoToEntity(
+    const user = await this.mappers.UpdateUserMapper.toEntity(
       userDto,
-      em ?? this.em
+      em ?? this.em,
+      ...args
     );
     if (em) {
       await em.persist(user);
     } else {
       await this.em.persistAndFlush(user);
     }
-    return this._mappers.UserMapper.serializeEntityToDto(user);
+    return this.mappers.UserMapper.toDto(user);
   }
-  async updateBatchUsers(userDtos, em) {
+  async updateBatchUsers(userDtos, em, ...args) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Updating batch users', userDtos);
     }
     const users = await Promise.all(
       userDtos.map(async (updateUserDto) =>
-        this._mappers.UpdateUserMapper.deserializeDtoToEntity(
+        this.mappers.UpdateUserMapper.toEntity(
           updateUserDto,
-          em ?? this.em
+          em ?? this.em,
+          ...args
         )
       )
     );
@@ -620,7 +626,7 @@ var BaseUserService = class {
       await this.em.persistAndFlush(users);
     }
     return Promise.all(
-      users.map((user) => this._mappers.UserMapper.serializeEntityToDto(user))
+      users.map((user) => this.mappers.UserMapper.toDto(user))
     );
   }
   async deleteUser(idDto, em) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forklaunch/implementation-iam-base",
-  "version": "0.5.8",
+  "version": "0.6.0",
   "description": "Billing basic implementation for forklaunch",
   "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
   "bugs": {
@@ -36,18 +36,18 @@
     "lib/**"
   ],
   "dependencies": {
-    "@forklaunch/common": "^0.5.7",
-    "@forklaunch/core": "^0.13.8",
-    "@forklaunch/internal": "^0.2.8",
-    "@forklaunch/validator": "^0.9.8",
-    "@mikro-orm/core": "^6.4.16",
+    "@forklaunch/common": "^0.6.3",
+    "@forklaunch/core": "^0.14.3",
+    "@forklaunch/internal": "^0.3.3",
+    "@forklaunch/validator": "^0.10.3",
+    "@mikro-orm/core": "^6.5.1",
     "@sinclair/typebox": "^0.34.40",
     "ajv": "^8.17.1",
-    "zod": "^4.1.1",
-    "@forklaunch/interfaces-iam": "0.5.7"
+    "zod": "^4.1.5",
+    "@forklaunch/interfaces-iam": "0.6.0"
   },
   "devDependencies": {
-    "@typescript/native-preview": "7.0.0-dev.20250825.1",
+    "@typescript/native-preview": "7.0.0-dev.20250828.1",
     "depcheck": "^1.4.7",
     "prettier": "^3.6.2",
     "typedoc": "^0.28.11"