@dalmore/api-contracts 0.0.0-dev.d8ef117 → 0.0.0-dev.e325dbb

package/common/types/{trade-line-item.type.ts → trade-line-item.types.ts}

@@ -8,6 +8,7 @@ import {
   IPaginationMeta,
   OfferingType,
   SignatureStatus,
+  StringToBooleanSchema,
 } from './common.types';
 import { fileIdSchema } from './file.types';
 import { accountIdSchema } from './account.types';
@@ -107,15 +108,7 @@ export type TradeLineItemQuery = z.infer<typeof TradeLineItemQuery>;
 
 export const TradeLineItemFiltersQuery = z.object({
   accountId: accountIdSchema.optional(),
-  hasSubdoc: z.preprocess(
-    (val) =>
-      val === 'true' || val === '1'
-        ? true
-        : val === 'false' || val === '0'
-          ? false
-          : val,
-    z.boolean().optional(),
-  ),
+  hasSubdoc: StringToBooleanSchema.optional(),
   saStatus: z.nativeEnum(SignatureStatus).optional(),
   offeringId: z.lazy(() => offeringIdSchema).optional(),
   search: z.string().max(50).optional(),

package/common/types/trade.types.ts

@@ -22,12 +22,13 @@ import {
   AccountStatus,
   SavedQuery,
 } from './common.types';
-import { offeringIdSchema } from './offering.types';
+import { IOffering, offeringIdSchema } from './offering.types';
 import { IBaseEntity } from './entity.types';
 import { extendZodWithOpenApi } from '@anatine/zod-openapi';
 import { TypeID } from 'typeid-js';
 import {
   paymentMethodIdSchema,
+  PaymentMethodResponse,
   PaymentMethodType,
 } from './payment-methods.types';
 import {
@@ -35,11 +36,12 @@ import {
   InvestorAccountExportFilters,
   ComplianceInvestorAccountExportFilters,
   RegisteredInvestorUserRawZod,
+  IInvestorAccount,
 } from './investor-account.types';
 import {
   tradeLineItemIdSchema,
   TradeLineItemZod,
-} from './trade-line-item.type';
+} from './trade-line-item.types';
 import { TradeAdjustmentZod } from './trade-adjustment.type';
 import { TransactionZod } from './transaction.types';
 import { accountIdSchema } from './account.types';
@@ -132,6 +134,7 @@ export const CheckResultsSchema = z.object({
 export type CheckResults = z.infer<typeof CheckResultsSchema>;
 
 export const TradeIdPrefix = 'trade';
+export const TradeSnapshotIdPrefix = 'trade_snapshot';
 
 export const tradeIdSchema = z.string().refine(
   (value) => {
@@ -170,6 +173,21 @@ export const tradeIdOrTidSchema = z.union([
     .openapi({ example: 'tid_00041061050r3gg28a1c60t3gf' }),
 ]);
 
+export const tradeSnapshotIdSchema = z.string().refine(
+  (value) => {
+    try {
+      const tid = TypeID.fromString(value);
+      return tid.getType() === TradeSnapshotIdPrefix;
+    } catch {
+      return false;
+    }
+  },
+  {
+    message:
+      'Invalid trade snapshot ID format. Must be a valid TypeID with "trade_snapshot" prefix. ex: trade_snapshot_00041061050r3gg28a1c60t3gf',
+  },
+);
+
 export enum SaStatus {
   PENDING = BaseStatus.PENDING,
   SIGNED = BaseStatus.SIGNED,
@@ -274,9 +292,21 @@ export type TradeBalanceResultZod = z.infer<typeof TradeBalanceResultZod>;
 
 export const TradeZod = IBaseEntity.extend({
   investorAccountId: z.lazy(() => investorAccountIdSchema.nullable()),
+  investorAccount: z
+    .lazy(() => IInvestorAccount)
+    .optional()
+    .nullable(),
+  offering: z
+    .lazy(() => IOffering)
+    .optional()
+    .nullable(),
   accountId: accountIdSchema.nullable(),
   offeringId: z.lazy(() => offeringIdSchema.nullable()),
   paymentMethodId: z.lazy(() => paymentMethodIdSchema).nullable(),
+  paymentMethod: z
+    .lazy(() => PaymentMethodResponse)
+    .optional()
+    .nullable(),
   userId: z.lazy(() => userIdSchema.nullable()),
   tradeNumber: z.string(),
   ip: z.string().nullable(),
@@ -342,6 +372,21 @@ export const TradeZod = IBaseEntity.extend({
 });
 export type TradeZod = z.infer<typeof TradeZod>;
 
+export enum SnapshotEvent {
+  COMPLIANCE_APPROVED = 'COMPLIANCE_APPROVED',
+  COMPLIANCE_REJECTED = 'COMPLIANCE_REJECTED',
+  CANCELLED = 'CANCELLED',
+  PLACED = 'PLACED',
+  SETTLED = 'SETTLED',
+}
+
+export const GetTradeSnapshotEventsResponse = z.object({
+  events: z.array(z.nativeEnum(SnapshotEvent)),
+});
+export type GetTradeSnapshotEventsResponse = z.infer<
+  typeof GetTradeSnapshotEventsResponse
+>;
+
 export const IPaginatedTrade = z.object({
   items: z.array(TradeZod),
   meta: IPaginationMeta,
@@ -424,6 +469,7 @@ export const TradeFiltersZod = z.object({
     .openapi({
       example: 'issuer_01jfw4q6qef30s6fpqtsxw94ya',
     }),
+  snapshotEvent: z.nativeEnum(SnapshotEvent).optional(),
   offeringType: z.nativeEnum(OfferingType).optional(),
   managedBy: z.nativeEnum(ManagedByType).optional(),
   platform: z.nativeEnum(Platforms).optional(),

package/common/types/trusted-contact.types.ts

@@ -2,7 +2,11 @@ import { extendZodWithOpenApi } from '@anatine/zod-openapi';
 import { TypeID } from 'typeid-js';
 import { z } from 'zod';
 import { IBaseEntity } from './entity.types';
-import { IPaginationMeta, TrustedContactRelationship } from './common.types';
+import {
+  EmailSchema,
+  IPaginationMeta,
+  TrustedContactRelationship,
+} from './common.types';
 import { PhoneZodSchema } from './phone.type';
 import { AddressSchema } from './address.types';
 import { investorAccountIdSchema } from './investor-account.types';
@@ -68,7 +72,7 @@ export const PostTrustedContactZod = z
   .object({
     firstName: z.string().min(1).max(255).openapi({ example: 'John' }),
     lastName: z.string().min(1).max(255).openapi({ example: 'Doe' }),
-    email: z.string().email().openapi({ example: 'john.doe@example.com' }),
+    email: EmailSchema.openapi({ example: 'john.doe@example.com' }),
     phone: PhoneZodSchema.nullable().optional(),
     relationship: z
       .nativeEnum(TrustedContactRelationship)
@@ -92,11 +96,7 @@ export const PatchTrustedContactZod = z
       .optional()
       .openapi({ example: 'John' }),
     lastName: z.string().min(1).max(255).optional().openapi({ example: 'Doe' }),
-    email: z
-      .string()
-      .email()
-      .optional()
-      .openapi({ example: 'john.doe@example.com' }),
+    email: EmailSchema.optional(),
     phone: PhoneZodSchema.nullable().optional(),
     relationship: z.nativeEnum(TrustedContactRelationship).optional().openapi({
       example: TrustedContactRelationship.CHILD,

package/common/types/user.types.ts

@@ -8,9 +8,10 @@ import {
   ManagedByType,
   OfferingType,
   PortalType,
+  StringToBooleanSchema,
   UserRole,
-  UserStatus,
   UserType,
+  EmailSchema,
 } from './common.types';
 import { dateOrString, IBaseEntity } from './entity.types';
 import { PhoneZodSchema } from './phone.type';
@@ -64,7 +65,7 @@ export const GetMeResponse = IBaseEntity.extend({
   email: z.string().email(),
   provider: z.string(),
   active: z.boolean(),
-  status: z.lazy(() => z.nativeEnum(UserStatus)),
+  locked: z.boolean(),
   lastLoginAt: dateOrString.nullable(),
   loginCount: z.number(),
   role: z.string(),
@@ -147,11 +148,7 @@ export const UserMeUpdateZod = z.object({
   firstName: z.string().optional(),
   lastName: z.string().optional(),
   password: z.string().min(6).optional(),
-  email: z
-    .string()
-    .email()
-    .transform((val) => val.toLowerCase())
-    .optional(),
+  email: EmailSchema.optional(),
 });
 
 export const UserZod = IBaseEntity.extend({
@@ -162,7 +159,7 @@ export const UserZod = IBaseEntity.extend({
   onboarding: z.string().nullable(),
   account: AccountWithoutUsersZod.optional(),
   active: z.boolean(),
-  status: z.nativeEnum(UserStatus),
+  locked: z.boolean(),
   userLogin: IBaseEntity.extend({
     firstName: z.string(),
     lastName: z.string(),
@@ -184,27 +181,9 @@ export const UserFiltersZod = z.object({
   search: z.string().max(50).optional(),
   role: z.nativeEnum(UserRole).optional(),
   portal: z.string().optional(),
-  status: z.nativeEnum(UserStatus).optional(),
-  active: z
-    .string()
-    .optional()
-    .refine((v) => !v || v === 'true' || v === 'false', {
-      message: 'active must be a boolean string',
-    })
-    .transform((v) => {
-      if (!v) return undefined;
-      return v === 'true';
-    }),
-  twoFactorEnabled: z
-    .string()
-    .optional()
-    .refine((v) => !v || v === 'true' || v === 'false', {
-      message: 'twoFactorEnabled must be a boolean string',
-    })
-    .transform((v) => {
-      if (!v) return undefined;
-      return v === 'true';
-    }),
+  locked: StringToBooleanSchema.optional(),
+  active: StringToBooleanSchema.optional(),
+  twoFactorEnabled: StringToBooleanSchema.optional(),
 });
 
 const usersInclude = z.enum(['account', 'role']);
@@ -279,7 +258,7 @@ export type IssuerUsersStatusUpdateResponse = z.infer<
 >;
 
 export const UpdateLockedStatus = z.object({
-  status: z.nativeEnum(UserStatus),
+  locked: z.boolean(),
 });
 
 export type UpdateLockedStatus = z.infer<typeof UpdateLockedStatus>;
@@ -290,7 +269,7 @@ export const UsersSummaryFilterZod = z.object({
   portalType: z.nativeEnum(PortalType).optional(),
   search: z.string().trim().max(50).optional(),
   selectRole: z.nativeEnum(UserRole).optional(),
-  status: z.nativeEnum(UserStatus).optional(),
+  locked: StringToBooleanSchema.optional(),
 });
 export type UsersSummaryFilterZod = z.infer<typeof UsersSummaryFilterZod>;
 
@@ -304,7 +283,7 @@ export const UsersSummaryZod = z.object({
   portalType: z.string(),
   loginCount: z.number().int(),
   lastLogin: z.date(),
-  status: z.nativeEnum(UserStatus),
+  locked: z.boolean(),
 });
 export type UsersSummaryZod = z.infer<typeof UsersSummaryZod>;
 

package/contracts/clients/trade-line-items/index.ts

@@ -14,7 +14,7 @@ import {
   TradeLineItemQuery,
   TradeLineItemResponse,
   TradeLineItemUpdate,
-} from '../../../common/types/trade-line-item.type';
+} from '../../../common/types/trade-line-item.types';
 
 const c = initContract();
 

package/contracts/clients/trades/index.ts

@@ -26,7 +26,7 @@ import {
   PostTradeLineItem,
   TradeLineItemQuery,
   TradeLineItemResponse,
-} from '../../../common/types/trade-line-item.type';
+} from '../../../common/types/trade-line-item.types';
 
 const c = initContract();
 

package/index.ts

@@ -0,0 +1,10 @@
+/**
+ * @dalmore/api-contracts
+ * Main entry point - re-exports clients contract and types
+ */
+
+// Re-export clients contract
+export * from './contracts/clients/index.js';
+
+// Re-export all common types
+export * from './common/types/index.js';

package/package.json

@@ -1,48 +1,42 @@
 {
   "name": "@dalmore/api-contracts",
-  "version": "0.0.0-dev.d8ef117",
+  "version": "0.0.0-dev.e325dbb",
   "description": "Type-safe API contracts for Dalmore Client Portal",
-  "main": "./contracts/index.ts",
-  "types": "./contracts/index.ts",
+  "type": "module",
+  "main": "./index.ts",
+  "types": "./index.ts",
   "exports": {
     ".": {
-      "types": "./contracts/index.ts",
-      "default": "./contracts/index.ts"
-    },
-    "./compliance": {
-      "types": "./contracts/compliance/index.ts",
-      "default": "./contracts/compliance/index.ts"
-    },
-    "./investors": {
-      "types": "./contracts/investors/index.ts",
-      "default": "./contracts/investors/index.ts"
-    },
-    "./issuers": {
-      "types": "./contracts/issuers/index.ts",
-      "default": "./contracts/issuers/index.ts"
+      "types": "./index.ts",
+      "import": "./index.ts",
+      "default": "./index.ts"
     },
     "./clients": {
       "types": "./contracts/clients/index.ts",
+      "import": "./contracts/clients/index.ts",
       "default": "./contracts/clients/index.ts"
     },
-    "./secondaries": {
-      "types": "./contracts/secondaries/index.ts",
-      "default": "./contracts/secondaries/index.ts"
-    },
-    "./compliance-apikey": {
-      "types": "./contracts/compliance-apikey/index.ts",
-      "default": "./contracts/compliance-apikey/index.ts"
-    },
     "./types": {
       "types": "./common/types/index.ts",
+      "import": "./common/types/index.ts",
       "default": "./common/types/index.ts"
-    },
-    "./types/*": {
-      "types": "./common/types/*.ts",
-      "default": "./common/types/*.ts"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      ".": [
+        "./index.ts"
+      ],
+      "clients": [
+        "./contracts/clients/index.ts"
+      ],
+      "types": [
+        "./common/types/index.ts"
+      ]
     }
   },
   "files": [
+    "index.ts",
     "contracts",
     "common"
   ],
@@ -68,9 +62,6 @@
     "typeid-js": "^1.2.0",
     "zod": "^3.24.4"
   },
-  "devDependencies": {
-    "typescript": "^5.8.3"
-  },
   "engines": {
     "node": ">=24.0.0 <25.0.0"
   }

package/contracts/compliance/account-contacts/index.ts

@@ -1,82 +0,0 @@
-import { initContract } from '@ts-rest/core';
-import {
-  accountIdSchema,
-  BadRequestError,
-  ForbiddenError,
-  InternalError,
-  NotFoundError,
-  UnauthorizedError,
-} from '../../../common/types';
-import {
-  accountContactIdSchema,
-  CompliancePatchAccountContactZod,
-  IAccountContact,
-} from '../../../common/types/account-contact.types';
-import { z } from 'zod';
-
-const c = initContract();
-
-export const accountContactsContract = c.router(
-  {
-    getAccountContacts: {
-      summary: '[ADMIN] Get Account Contacts',
-      method: 'GET',
-      path: '',
-      metadata: {
-        auth: true,
-      },
-      query: z.object({
-        accountId: accountIdSchema,
-      }),
-      responses: {
-        200: z.array(IAccountContact),
-        401: UnauthorizedError,
-        403: ForbiddenError,
-        500: InternalError,
-      },
-    },
-    getAccountContact: {
-      summary: '[ADMIN] Get account contact by id',
-      method: 'GET',
-      path: '/:id',
-      metadata: {
-        auth: true,
-      },
-      pathParams: z.object({
-        id: accountContactIdSchema,
-      }),
-      query: z.object({
-        accountId: accountIdSchema,
-      }),
-      responses: {
-        200: IAccountContact,
-        401: UnauthorizedError,
-        403: ForbiddenError,
-        404: NotFoundError,
-      },
-    },
-    patchAccountContact: {
-      summary: '[ADMIN] Update account contact',
-      method: 'PATCH',
-      path: '/:id',
-      metadata: {
-        auth: true,
-      },
-      pathParams: z.object({
-        id: accountContactIdSchema,
-      }),
-      body: CompliancePatchAccountContactZod,
-      responses: {
-        200: IAccountContact,
-        400: BadRequestError,
-        401: UnauthorizedError,
-        403: ForbiddenError,
-        404: NotFoundError,
-        500: InternalError,
-      },
-    },
-  },
-  {
-    pathPrefix: 'account-contacts',
-  },
-);

package/contracts/compliance/account-managers/index.ts

@@ -1,142 +0,0 @@
-import { initContract } from '@ts-rest/core';
-import { z } from 'zod';
-import {
-  BadRequestError,
-  ForbiddenError,
-  InternalError,
-  NotFoundError,
-  PaginationOptionsZod,
-  PreconditionFailedError,
-  UnauthorizedError,
-} from '../../../common/types';
-import {
-  AccountManagerDeleteQuery,
-  AccountManagerDeleteResponse,
-  accountManagerIdSchema,
-  AccountManagersIncludeQuery,
-  IAccountManagerZod,
-  IPaginatedAccountManager,
-  PatchAccountManagerZod,
-  PostAccountManagerZod,
-  SetDefaultAccountManagerForAllAccountsResponse,
-} from '../../../common/types/account-manager.types';
-
-const c = initContract();
-
-export const accountManagersContract = c.router(
-  {
-    getAccountManagers: {
-      summary: 'Get account managers',
-      method: 'GET',
-      path: '',
-      metadata: {
-        auth: true,
-      },
-      query: PaginationOptionsZod.merge(AccountManagersIncludeQuery),
-      responses: {
-        200: IPaginatedAccountManager,
-        400: BadRequestError,
-        401: UnauthorizedError,
-        403: ForbiddenError,
-        500: InternalError,
-      },
-    },
-    getAccountManager: {
-      summary: 'Get account manager by id',
-      method: 'GET',
-      path: '/:id',
-      metadata: {
-        auth: true,
-      },
-      query: z.object({}).merge(AccountManagersIncludeQuery),
-      pathParams: z.object({
-        id: accountManagerIdSchema,
-      }),
-      responses: {
-        200: IAccountManagerZod,
-        400: BadRequestError,
-        401: UnauthorizedError,
-        403: ForbiddenError,
-        404: NotFoundError,
-        500: InternalError,
-      },
-    },
-    setDefaultAccountManagerForAllAccounts: {
-      summary: '[ADMIN] Set default account manager for all accounts',
-      method: 'PATCH',
-      path: '/set-default-for-all-accounts',
-      metadata: {
-        auth: true,
-      },
-      body: z.object({}),
-      responses: {
-        200: SetDefaultAccountManagerForAllAccountsResponse,
-        400: BadRequestError,
-        401: UnauthorizedError,
-        403: ForbiddenError,
-        500: InternalError,
-      },
-    },
-    patchAccountManager: {
-      summary: 'Update account manager by id',
-      method: 'PATCH',
-      path: '/:id',
-      metadata: {
-        auth: true,
-      },
-      pathParams: z.object({
-        id: accountManagerIdSchema,
-      }),
-      body: PatchAccountManagerZod,
-      responses: {
-        201: IAccountManagerZod,
-        400: BadRequestError,
-        401: UnauthorizedError,
-        403: ForbiddenError,
-        404: NotFoundError,
-        500: InternalError,
-      },
-    },
-    postAccountManager: {
-      summary: 'Create account manager',
-      method: 'POST',
-      path: '',
-      metadata: {
-        auth: true,
-      },
-      body: PostAccountManagerZod,
-      responses: {
-        201: IAccountManagerZod,
-        400: BadRequestError,
-        401: UnauthorizedError,
-        403: ForbiddenError,
-        500: InternalError,
-      },
-    },
-    deleteAccountManager: {
-      summary: 'Delete account manager by id',
-      method: 'DELETE',
-      path: '/:id',
-      metadata: {
-        auth: true,
-      },
-      pathParams: z.object({
-        id: accountManagerIdSchema,
-      }),
-      query: AccountManagerDeleteQuery,
-      responses: {
-        201: AccountManagerDeleteResponse,
-        400: BadRequestError,
-        401: UnauthorizedError,
-        403: ForbiddenError,
-        404: NotFoundError,
-        412: PreconditionFailedError,
-        500: InternalError,
-      },
-    },
-  },
-
-  {
-    pathPrefix: 'account-managers',
-  },
-);