@forklaunch/implementation-iam-base 0.1.4 → 0.1.5

package/lib/__test__/schemaEquality.test.js

@@ -14,16 +14,16 @@ const zodPermissionSchema = ZodPermissionSchema(false);
 const typeboxPermissionSchema = TypeboxPermissionSchema(false);
 const zodUpdateRoleSchema = ZodUpdateRoleSchema(false);
 const typeboxUpdateRoleSchema = TypeboxUpdateRoleSchema(false);
-const zodRoleSchema = ZodRoleSchema(false)(zodPermissionSchema);
-const typeboxRoleSchema = TypeboxRoleSchema(false)(typeboxPermissionSchema);
+const zodRoleSchema = ZodRoleSchema(false);
+const typeboxRoleSchema = TypeboxRoleSchema(false);
 const zodUpdateUserSchema = ZodUpdateUserSchema(false);
 const typeboxUpdateUserSchema = TypeboxUpdateUserSchema(false);
-const zodUserSchema = ZodUserSchema(false)(zodRoleSchema);
-const typeboxUserSchema = TypeboxUserSchema(false)(typeboxRoleSchema);
+const zodUserSchema = ZodUserSchema(false);
+const typeboxUserSchema = TypeboxUserSchema(false);
 const zodUpdateOrganizationSchema = ZodUpdateOrganizationSchema(false);
 const typeboxUpdateOrganizationSchema = TypeboxUpdateOrganizationSchema(false);
-const zodOrganizationSchema = ZodOrganizationSchema(false)(zodUserSchema, DummyEnum);
-const typeboxOrganizationSchema = TypeboxOrganizationSchema(false)(typeboxUserSchema, DummyEnum);
+const zodOrganizationSchema = ZodOrganizationSchema(false)(DummyEnum);
+const typeboxOrganizationSchema = TypeboxOrganizationSchema(false)(DummyEnum);
 describe('schema equality', () => {
     it('should be equal for permission', () => {
         expect(isTrue(testSchemaEquality(ZodCreatePermissionSchema, TypeboxCreatePermissionSchema, {

package/lib/eject/schemas/index.ts

@@ -0,0 +1,4 @@
+export * from './organization.schema';
+export * from './permission.schema';
+export * from './role.schema';
+export * from './user.schema';

package/lib/eject/schemas/organization.schema.ts

@@ -1,4 +1,4 @@
-import { IdiomaticSchema, LiteralSchema } from '@forklaunch/validator';
+import { LiteralSchema } from '@forklaunch/validator';
 import {
   array,
   date,
@@ -6,9 +6,9 @@ import {
   optional,
   string,
   unknown,
-  uuid,
-  ZodSchemaValidator
-} from '@forklaunch/validator/zod';
+  uuid
+} from '@{{app_name}}/core';
+import { UserSchema } from './user.schema';
 
 export const CreateOrganizationSchema = {
   name: string,
@@ -29,21 +29,23 @@ export const UpdateOrganizationSchema = (uuidId: boolean) => ({
 
 export const OrganizationSchema =
   (uuidId: boolean) =>
-  <
-    UserDtoSchema extends IdiomaticSchema<ZodSchemaValidator>,
-    OrganizationStatus extends Record<string, LiteralSchema>
-  >(
-    UserDtoSchema: UserDtoSchema,
-    OrganizationStatus: OrganizationStatus
+  <OrganizationStatus extends Record<string, LiteralSchema>>(
+    organizationStatus: OrganizationStatus
   ) => ({
     id: uuidId ? uuid : string,
     name: string,
-    users: array(UserDtoSchema),
+    users: array(UserSchema(uuidId)),
     domain: string,
     subscription: string,
-    status: enum_(OrganizationStatus),
+    status: enum_(organizationStatus),
     logoUrl: optional(string),
     extraFields: optional(unknown),
     createdAt: optional(date),
     updatedAt: optional(date)
   });
+
+export const BaseOrganizationServiceSchemas = (uuidId: boolean) => ({
+  CreateOrganizationSchema,
+  UpdateOrganizationSchema: UpdateOrganizationSchema(uuidId),
+  OrganizationSchema: OrganizationSchema(uuidId)
+});

package/lib/eject/schemas/permission.schema.ts

@@ -5,7 +5,7 @@ import {
   string,
   unknown,
   uuid
-} from '@forklaunch/validator/zod';
+} from '@{{app_name}}/core';
 
 export const CreatePermissionSchema = {
   slug: string,
@@ -28,3 +28,9 @@ export const PermissionSchema = (uuidId: boolean) => ({
   createdAt: optional(date),
   updatedAt: optional(date)
 });
+
+export const BasePermissionServiceSchemas = (uuidId: boolean) => ({
+  CreatePermissionSchema,
+  UpdatePermissionSchema: UpdatePermissionSchema(uuidId),
+  PermissionSchema: PermissionSchema(uuidId)
+});

package/lib/eject/schemas/role.schema.ts

@@ -1,13 +1,12 @@
-import { IdiomaticSchema } from '@forklaunch/validator';
 import {
   array,
   date,
   optional,
   string,
   unknown,
-  uuid,
-  ZodSchemaValidator
-} from '@forklaunch/validator/zod';
+  uuid
+} from '@{{app_name}}/core';
+import { PermissionSchema } from './permission.schema';
 
 export const CreateRoleSchema = {
   name: string,
@@ -22,15 +21,17 @@ export const UpdateRoleSchema = (uuidId: boolean) => ({
   extraFields: optional(unknown)
 });
 
-export const RoleSchema =
-  (uuidId: boolean) =>
-  <PermissionSchema extends IdiomaticSchema<ZodSchemaValidator>>(
-    PermissionSchema: PermissionSchema
-  ) => ({
-    id: uuidId ? uuid : string,
-    name: string,
-    permissions: array(PermissionSchema),
-    extraFields: optional(unknown),
-    createdAt: optional(date),
-    updatedAt: optional(date)
-  });
+export const RoleSchema = (uuidId: boolean) => ({
+  id: uuidId ? uuid : string,
+  name: string,
+  permissions: array(PermissionSchema(uuidId)),
+  extraFields: optional(unknown),
+  createdAt: optional(date),
+  updatedAt: optional(date)
+});
+
+export const BaseRoleServiceSchemas = (uuidId: boolean) => ({
+  CreateRoleSchema,
+  UpdateRoleSchema: UpdateRoleSchema(uuidId),
+  RoleSchema: RoleSchema(uuidId)
+});

package/lib/eject/schemas/user.schema.ts

@@ -1,4 +1,3 @@
-import { IdiomaticSchema } from '@forklaunch/validator';
 import {
   array,
   date,
@@ -6,9 +5,9 @@ import {
   optional,
   string,
   unknown,
-  uuid,
-  ZodSchemaValidator
-} from '@forklaunch/validator/zod';
+  uuid
+} from '@{{app_name}}/core';
+import { RoleSchema } from './role.schema';
 
 export const CreateUserSchema = {
   email: email,
@@ -34,19 +33,21 @@ export const UpdateUserSchema = (uuidId: boolean) => ({
   extraFields: optional(unknown)
 });
 
-export const UserSchema =
-  (uuidId: boolean) =>
-  <RoleDtoSchema extends IdiomaticSchema<ZodSchemaValidator>>(
-    RoleDtoSchema: RoleDtoSchema
-  ) => ({
-    id: uuidId ? uuid : string,
-    email: email,
-    firstName: string,
-    lastName: string,
-    roles: array(RoleDtoSchema),
-    phoneNumber: optional(string),
-    subscription: optional(string),
-    extraFields: optional(unknown),
-    createdAt: optional(date),
-    updatedAt: optional(date)
-  });
+export const UserSchema = (uuidId: boolean) => ({
+  id: uuidId ? uuid : string,
+  email: email,
+  firstName: string,
+  lastName: string,
+  roles: array(RoleSchema(uuidId)),
+  phoneNumber: optional(string),
+  subscription: optional(string),
+  extraFields: optional(unknown),
+  createdAt: optional(date),
+  updatedAt: optional(date)
+});
+
+export const BaseUserServiceSchemas = (uuidId: boolean) => ({
+  CreateUserSchema,
+  UpdateUserSchema: UpdateUserSchema(uuidId),
+  UserSchema: UserSchema(uuidId)
+});

package/lib/eject/services/index.ts

@@ -0,0 +1,4 @@
+export * from './organization.service';
+export * from './permission.service';
+export * from './role.service';
+export * from './user.service';

package/lib/eject/services/organization.service.ts

@@ -1,9 +1,3 @@
-import {
-  CreateOrganizationDto,
-  OrganizationDto,
-  OrganizationService,
-  UpdateOrganizationDto
-} from '@forklaunch/interfaces-iam';
 import { IdDto, InstanceTypeRecord } from '@forklaunch/common';
 import {
   InternalDtoMapper,
@@ -16,6 +10,12 @@ import {
   OpenTelemetryCollector
 } from '@forklaunch/core/http';
 import { MapNestedDtoArraysToCollections } from '@forklaunch/core/services';
+import { OrganizationService } from '@forklaunch/interfaces-iam/interfaces';
+import {
+  CreateOrganizationDto,
+  OrganizationDto,
+  UpdateOrganizationDto
+} from '@forklaunch/interfaces-iam/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
 import { EntityManager } from '@mikro-orm/core';
 

package/lib/eject/services/permission.service.ts

@@ -1,11 +1,8 @@
 import {
-  CreatePermissionDto,
-  PermissionDto,
   PermissionService,
-  RoleDto,
-  RoleService,
-  UpdatePermissionDto
-} from '@forklaunch/interfaces-iam';
+  RoleService
+} from '@forklaunch/interfaces-iam/interfaces';
+
 import { IdDto, IdsDto, InstanceTypeRecord } from '@forklaunch/common';
 import {
   InternalDtoMapper,
@@ -18,6 +15,12 @@ import {
   OpenTelemetryCollector
 } from '@forklaunch/core/http';
 import { MapNestedDtoArraysToCollections } from '@forklaunch/core/services';
+import {
+  CreatePermissionDto,
+  PermissionDto,
+  RoleDto,
+  UpdatePermissionDto
+} from '@forklaunch/interfaces-iam/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
 import { EntityManager } from '@mikro-orm/core';
 

package/lib/eject/services/role.service.ts

@@ -1,13 +1,8 @@
-import {
-  CreateRoleDto,
-  RoleDto,
-  RoleService,
-  UpdateRoleDto
-} from '@forklaunch/interfaces-iam';
 import {
   MetricsDefinition,
   OpenTelemetryCollector
 } from '@forklaunch/core/http';
+import { RoleService } from '@forklaunch/interfaces-iam/interfaces';
 import { EntityManager } from '@mikro-orm/core';
 
 import { IdDto, IdsDto, InstanceTypeRecord } from '@forklaunch/common';
@@ -18,6 +13,11 @@ import {
   transformIntoInternalDtoMapper
 } from '@forklaunch/core/dtoMapper';
 import { MapNestedDtoArraysToCollections } from '@forklaunch/core/services';
+import {
+  CreateRoleDto,
+  RoleDto,
+  UpdateRoleDto
+} from '@forklaunch/interfaces-iam/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
 
 export class BaseRoleService<

package/lib/eject/services/user.service.ts

@@ -1,16 +1,9 @@
 import {
-  CreateUserDto,
+  OrganizationService,
   RoleService,
-  UpdateUserDto,
-  UserDto,
   UserService
-} from '@forklaunch/interfaces-iam';
-import {
-  MetricsDefinition,
-  OpenTelemetryCollector
-} from '@forklaunch/core/http';
+} from '@forklaunch/interfaces-iam/interfaces';
 
-import { OrganizationService } from '@forklaunch/interfaces-iam';
 import { IdDto, IdsDto, InstanceTypeRecord } from '@forklaunch/common';
 import {
   InternalDtoMapper,
@@ -18,7 +11,16 @@ import {
   ResponseDtoMapperConstructor,
   transformIntoInternalDtoMapper
 } from '@forklaunch/core/dtoMapper';
+import {
+  MetricsDefinition,
+  OpenTelemetryCollector
+} from '@forklaunch/core/http';
 import { MapNestedDtoArraysToCollections } from '@forklaunch/core/services';
+import {
+  CreateUserDto,
+  UpdateUserDto,
+  UserDto
+} from '@forklaunch/interfaces-iam/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
 import { EntityManager } from '@mikro-orm/core';
 

package/lib/schemas/index.d.ts

@@ -0,0 +1,5 @@
+export * from './organization.schema';
+export * from './permission.schema';
+export * from './role.schema';
+export * from './user.schema';
+//# sourceMappingURL=index.d.ts.map

package/lib/schemas/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../schemas/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC"}

package/lib/schemas/index.js

@@ -0,0 +1,4 @@
+export * from './organization.schema';
+export * from './permission.schema';
+export * from './role.schema';
+export * from './user.schema';