@morpho-dev/router 0.0.15 → 0.0.16

package/dist/index.node.d.cts

@@ -1,4 +1,5 @@
-import { Offer, Errors, Format } from '@morpho-dev/mempool';
+import * as _morpho_dev_mempool from '@morpho-dev/mempool';
+import { Compute, Offer, Errors, Format } from '@morpho-dev/mempool';
 export * from '@morpho-dev/mempool';
 import * as viem from 'viem';
 import { Address, Account, Hex, PublicClient } from 'viem';
@@ -14,10 +15,6 @@ import { Pool } from 'pg';
 export * from 'drizzle-orm';
 import * as drizzle_orm_pg_core from 'drizzle-orm/pg-core';
 
-type Compute<type> = {
-    [key in keyof type]: type[key];
-} & unknown;
-
 declare const chainNames: readonly ["ethereum", "base"];
 type ChainName = (typeof chainNames)[number];
 declare const ChainId: {
@@ -115,13 +112,6 @@ type Action = keyof typeof schemas;
 declare function parse<A extends Action>(action: A, query: unknown): z.infer<(typeof schemas)[A]>;
 declare function safeParse<A extends Action>(action: A, query: unknown): z.ZodSafeParseResult<z.infer<(typeof schemas)[A]>>;
 
-declare const index$1_OpenApi: typeof OpenApi;
-declare const index$1_parse: typeof parse;
-declare const index$1_safeParse: typeof safeParse;
-declare namespace index$1 {
-  export { index$1_OpenApi as OpenApi, index$1_parse as parse, index$1_safeParse as safeParse };
-}
-
 declare const OfferStatusValues: readonly ["valid", "callback_not_supported", "callback_error", "unverified"];
 type OfferStatus = (typeof OfferStatusValues)[number];
 type OfferMetadata = {
@@ -138,7 +128,7 @@ declare const RouterOfferSchema: (parameters?: {
     offering: zod_v4.ZodPipe<zod_v4.ZodString, zod_v4.ZodTransform<`0x${string}`, string>>;
     assets: zod_v4.ZodBigInt;
     rate: zod_v4.ZodBigInt;
-    maturity: zod_v4.ZodNumber;
+    maturity: zod_v4.ZodPipe<zod_v4.ZodNumber, zod_v4.ZodTransform<number & _morpho_dev_mempool.Brand<"Maturity">, number>>;
     expiry: zod_v4.ZodNumber;
     start: zod_v4.ZodNumber;
     nonce: zod_v4.ZodBigInt;
@@ -215,6 +205,35 @@ declare namespace RouterOffer$1 {
   export { RouterOffer$1_InvalidRouterOfferError as InvalidRouterOfferError, type RouterOffer$1_OfferMetadata as OfferMetadata, type RouterOffer$1_OfferStatus as OfferStatus, RouterOffer$1_OfferStatusValues as OfferStatusValues, type RouterOffer$1_RouterOffer as RouterOffer, RouterOffer$1_RouterOfferSchema as RouterOfferSchema, RouterOffer$1_from as from, RouterOffer$1_fromSnakeCase as fromSnakeCase, RouterOffer$1_random as random, RouterOffer$1_toSnakeCase as toSnakeCase };
 }
 
+type OfferResponse = {
+    offer: Offer.Offer;
+    consumed: bigint;
+    status: OfferStatus;
+    metadata?: OfferMetadata;
+};
+/**
+ * Transforms a RouterOffer to OfferResponse format.
+ * @param routerOffer - The router offer to transform.
+ * @returns The router offer response with offer as a nested property.
+ */
+declare function toResponse(routerOffer: RouterOffer): OfferResponse;
+/**
+ * Transforms a OfferResponse to RouterOffer format.
+ * @param offerResponse - The router offer response to transform.
+ * @returns The router offer with all properties at the top level.
+ */
+declare function fromResponse(offerResponse: OfferResponse): RouterOffer;
+
+type index$1_OfferResponse = OfferResponse;
+declare const index$1_OpenApi: typeof OpenApi;
+declare const index$1_fromResponse: typeof fromResponse;
+declare const index$1_parse: typeof parse;
+declare const index$1_safeParse: typeof safeParse;
+declare const index$1_toResponse: typeof toResponse;
+declare namespace index$1 {
+  export { type index$1_OfferResponse as OfferResponse, index$1_OpenApi as OpenApi, index$1_fromResponse as fromResponse, index$1_parse as parse, index$1_safeParse as safeParse, index$1_toResponse as toResponse };
+}
+
 type GetParameters = {
     /** Filter by multiple creator addresses (comma-separated) */
     creators?: string[];
@@ -304,11 +323,11 @@ type RouterClientConfig = {
 type Client = Compute<RouterClientConfig & {
     get: (parameters: GetParameters) => Promise<{
         cursor: string | null;
-        offers: RouterOffer[];
+        offers: OfferResponse[];
     }>;
     match: (parameters: MatchParameters) => Promise<{
         cursor: string | null;
-        offers: RouterOffer[];
+        offers: OfferResponse[];
     }>;
 }>;
 declare function connect(opts?: {
@@ -324,7 +343,7 @@ declare namespace connect {
  */
 declare function get(config: RouterClientConfig, parameters: GetParameters): Promise<{
     cursor: string | null;
-    offers: RouterOffer[];
+    offers: OfferResponse[];
 }>;
 declare namespace get {
     type ErrorType = GetApiErrorType;
@@ -335,7 +354,7 @@ declare namespace get {
  */
 declare function match(config: RouterClientConfig, parameters: MatchParameters): Promise<{
     cursor: string | null;
-    offers: RouterOffer[];
+    offers: OfferResponse[];
 }>;
 declare namespace match {
     type ErrorType = GetApiErrorType;
@@ -1338,7 +1357,7 @@ declare function morpho(parameters: {
     readonly offering: Address;
     readonly assets: bigint;
     readonly rate: bigint;
-    readonly maturity: number;
+    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
     readonly expiry: number;
     readonly nonce: bigint;
     readonly buy: boolean;
@@ -1362,7 +1381,7 @@ declare function morpho(parameters: {
     readonly offering: Address;
     readonly assets: bigint;
     readonly rate: bigint;
-    readonly maturity: number;
+    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
     readonly expiry: number;
     readonly nonce: bigint;
     readonly buy: boolean;
@@ -1386,7 +1405,7 @@ declare function morpho(parameters: {
     readonly offering: Address;
     readonly assets: bigint;
     readonly rate: bigint;
-    readonly maturity: number;
+    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
     readonly expiry: number;
     readonly nonce: bigint;
     readonly buy: boolean;
@@ -1410,7 +1429,7 @@ declare function morpho(parameters: {
     readonly offering: Address;
     readonly assets: bigint;
     readonly rate: bigint;
-    readonly maturity: number;
+    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
     readonly expiry: number;
     readonly nonce: bigint;
     readonly buy: boolean;
@@ -1434,7 +1453,7 @@ declare function morpho(parameters: {
     readonly offering: Address;
     readonly assets: bigint;
     readonly rate: bigint;
-    readonly maturity: number;
+    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
     readonly expiry: number;
     readonly nonce: bigint;
     readonly buy: boolean;
@@ -1458,7 +1477,7 @@ declare function morpho(parameters: {
     readonly offering: Address;
     readonly assets: bigint;
     readonly rate: bigint;
-    readonly maturity: number;
+    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
     readonly expiry: number;
     readonly nonce: bigint;
     readonly buy: boolean;
@@ -1533,4 +1552,4 @@ declare namespace Validation {
   export { type Validation_Issue as Issue, type Validation_Result as Result, Validation_run as run };
 }
 
-export { index$1 as ApiSchema, Chain$1 as Chain, type Compute, type Cursor, EVM, Logger$1 as Logger, OfferDB, OfferRepository$1 as OfferRepository, index as Router, RouterEvent$1 as RouterEvent, RouterOffer$1 as RouterOffer, Validation, ValidationRule, batch$1 as batch, consumed, decodeCursor, encodeCursor, offerCollaterals, offerStatus, offers, poll, validateCursor, wait };
+export { index$1 as ApiSchema, Chain$1 as Chain, type Cursor, EVM, Logger$1 as Logger, OfferDB, OfferRepository$1 as OfferRepository, index as Router, RouterEvent$1 as RouterEvent, RouterOffer$1 as RouterOffer, Validation, ValidationRule, batch$1 as batch, consumed, decodeCursor, encodeCursor, offerCollaterals, offerStatus, offers, poll, validateCursor, wait };

package/dist/index.node.d.ts

@@ -1,4 +1,5 @@
-import { Offer, Errors, Format } from '@morpho-dev/mempool';
+import * as _morpho_dev_mempool from '@morpho-dev/mempool';
+import { Compute, Offer, Errors, Format } from '@morpho-dev/mempool';
 export * from '@morpho-dev/mempool';
 import * as viem from 'viem';
 import { Address, Account, Hex, PublicClient } from 'viem';
@@ -14,10 +15,6 @@ import { Pool } from 'pg';
 export * from 'drizzle-orm';
 import * as drizzle_orm_pg_core from 'drizzle-orm/pg-core';
 
-type Compute<type> = {
-    [key in keyof type]: type[key];
-} & unknown;
-
 declare const chainNames: readonly ["ethereum", "base"];
 type ChainName = (typeof chainNames)[number];
 declare const ChainId: {
@@ -115,13 +112,6 @@ type Action = keyof typeof schemas;
 declare function parse<A extends Action>(action: A, query: unknown): z.infer<(typeof schemas)[A]>;
 declare function safeParse<A extends Action>(action: A, query: unknown): z.ZodSafeParseResult<z.infer<(typeof schemas)[A]>>;
 
-declare const index$1_OpenApi: typeof OpenApi;
-declare const index$1_parse: typeof parse;
-declare const index$1_safeParse: typeof safeParse;
-declare namespace index$1 {
-  export { index$1_OpenApi as OpenApi, index$1_parse as parse, index$1_safeParse as safeParse };
-}
-
 declare const OfferStatusValues: readonly ["valid", "callback_not_supported", "callback_error", "unverified"];
 type OfferStatus = (typeof OfferStatusValues)[number];
 type OfferMetadata = {
@@ -138,7 +128,7 @@ declare const RouterOfferSchema: (parameters?: {
     offering: zod_v4.ZodPipe<zod_v4.ZodString, zod_v4.ZodTransform<`0x${string}`, string>>;
     assets: zod_v4.ZodBigInt;
     rate: zod_v4.ZodBigInt;
-    maturity: zod_v4.ZodNumber;
+    maturity: zod_v4.ZodPipe<zod_v4.ZodNumber, zod_v4.ZodTransform<number & _morpho_dev_mempool.Brand<"Maturity">, number>>;
     expiry: zod_v4.ZodNumber;
     start: zod_v4.ZodNumber;
     nonce: zod_v4.ZodBigInt;
@@ -215,6 +205,35 @@ declare namespace RouterOffer$1 {
   export { RouterOffer$1_InvalidRouterOfferError as InvalidRouterOfferError, type RouterOffer$1_OfferMetadata as OfferMetadata, type RouterOffer$1_OfferStatus as OfferStatus, RouterOffer$1_OfferStatusValues as OfferStatusValues, type RouterOffer$1_RouterOffer as RouterOffer, RouterOffer$1_RouterOfferSchema as RouterOfferSchema, RouterOffer$1_from as from, RouterOffer$1_fromSnakeCase as fromSnakeCase, RouterOffer$1_random as random, RouterOffer$1_toSnakeCase as toSnakeCase };
 }
 
+type OfferResponse = {
+    offer: Offer.Offer;
+    consumed: bigint;
+    status: OfferStatus;
+    metadata?: OfferMetadata;
+};
+/**
+ * Transforms a RouterOffer to OfferResponse format.
+ * @param routerOffer - The router offer to transform.
+ * @returns The router offer response with offer as a nested property.
+ */
+declare function toResponse(routerOffer: RouterOffer): OfferResponse;
+/**
+ * Transforms a OfferResponse to RouterOffer format.
+ * @param offerResponse - The router offer response to transform.
+ * @returns The router offer with all properties at the top level.
+ */
+declare function fromResponse(offerResponse: OfferResponse): RouterOffer;
+
+type index$1_OfferResponse = OfferResponse;
+declare const index$1_OpenApi: typeof OpenApi;
+declare const index$1_fromResponse: typeof fromResponse;
+declare const index$1_parse: typeof parse;
+declare const index$1_safeParse: typeof safeParse;
+declare const index$1_toResponse: typeof toResponse;
+declare namespace index$1 {
+  export { type index$1_OfferResponse as OfferResponse, index$1_OpenApi as OpenApi, index$1_fromResponse as fromResponse, index$1_parse as parse, index$1_safeParse as safeParse, index$1_toResponse as toResponse };
+}
+
 type GetParameters = {
     /** Filter by multiple creator addresses (comma-separated) */
     creators?: string[];
@@ -304,11 +323,11 @@ type RouterClientConfig = {
 type Client = Compute<RouterClientConfig & {
     get: (parameters: GetParameters) => Promise<{
         cursor: string | null;
-        offers: RouterOffer[];
+        offers: OfferResponse[];
     }>;
     match: (parameters: MatchParameters) => Promise<{
         cursor: string | null;
-        offers: RouterOffer[];
+        offers: OfferResponse[];
     }>;
 }>;
 declare function connect(opts?: {
@@ -324,7 +343,7 @@ declare namespace connect {
  */
 declare function get(config: RouterClientConfig, parameters: GetParameters): Promise<{
     cursor: string | null;
-    offers: RouterOffer[];
+    offers: OfferResponse[];
 }>;
 declare namespace get {
     type ErrorType = GetApiErrorType;
@@ -335,7 +354,7 @@ declare namespace get {
  */
 declare function match(config: RouterClientConfig, parameters: MatchParameters): Promise<{
     cursor: string | null;
-    offers: RouterOffer[];
+    offers: OfferResponse[];
 }>;
 declare namespace match {
     type ErrorType = GetApiErrorType;
@@ -1338,7 +1357,7 @@ declare function morpho(parameters: {
     readonly offering: Address;
     readonly assets: bigint;
     readonly rate: bigint;
-    readonly maturity: number;
+    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
     readonly expiry: number;
     readonly nonce: bigint;
     readonly buy: boolean;
@@ -1362,7 +1381,7 @@ declare function morpho(parameters: {
     readonly offering: Address;
     readonly assets: bigint;
     readonly rate: bigint;
-    readonly maturity: number;
+    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
     readonly expiry: number;
     readonly nonce: bigint;
     readonly buy: boolean;
@@ -1386,7 +1405,7 @@ declare function morpho(parameters: {
     readonly offering: Address;
     readonly assets: bigint;
     readonly rate: bigint;
-    readonly maturity: number;
+    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
     readonly expiry: number;
     readonly nonce: bigint;
     readonly buy: boolean;
@@ -1410,7 +1429,7 @@ declare function morpho(parameters: {
     readonly offering: Address;
     readonly assets: bigint;
     readonly rate: bigint;
-    readonly maturity: number;
+    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
     readonly expiry: number;
     readonly nonce: bigint;
     readonly buy: boolean;
@@ -1434,7 +1453,7 @@ declare function morpho(parameters: {
     readonly offering: Address;
     readonly assets: bigint;
     readonly rate: bigint;
-    readonly maturity: number;
+    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
     readonly expiry: number;
     readonly nonce: bigint;
     readonly buy: boolean;
@@ -1458,7 +1477,7 @@ declare function morpho(parameters: {
     readonly offering: Address;
     readonly assets: bigint;
     readonly rate: bigint;
-    readonly maturity: number;
+    readonly maturity: number & _morpho_dev_mempool.Brand<"Maturity">;
     readonly expiry: number;
     readonly nonce: bigint;
     readonly buy: boolean;
@@ -1533,4 +1552,4 @@ declare namespace Validation {
   export { type Validation_Issue as Issue, type Validation_Result as Result, Validation_run as run };
 }
 
-export { index$1 as ApiSchema, Chain$1 as Chain, type Compute, type Cursor, EVM, Logger$1 as Logger, OfferDB, OfferRepository$1 as OfferRepository, index as Router, RouterEvent$1 as RouterEvent, RouterOffer$1 as RouterOffer, Validation, ValidationRule, batch$1 as batch, consumed, decodeCursor, encodeCursor, offerCollaterals, offerStatus, offers, poll, validateCursor, wait };
+export { index$1 as ApiSchema, Chain$1 as Chain, type Cursor, EVM, Logger$1 as Logger, OfferDB, OfferRepository$1 as OfferRepository, index as Router, RouterEvent$1 as RouterEvent, RouterOffer$1 as RouterOffer, Validation, ValidationRule, batch$1 as batch, consumed, decodeCursor, encodeCursor, offerCollaterals, offerStatus, offers, poll, validateCursor, wait };

package/dist/index.node.js

@@ -8211,8 +8211,10 @@ var chains = {
 var apiSchema_exports = {};
 __export(apiSchema_exports, {
   OpenApi: () => OpenApi,
+  fromResponse: () => fromResponse,
   parse: () => parse,
-  safeParse: () => safeParse
+  safeParse: () => safeParse,
+  toResponse: () => toResponse
 });
 
 // src/RouterOffer.ts
@@ -8857,6 +8859,26 @@ var OpenApi = zodOpenapi.createDocument({
   paths
 });
 
+// src/core/apiSchema/utils.ts
+function toResponse(routerOffer) {
+  const { consumed: consumed2, status, metadata, ...offer } = routerOffer;
+  return {
+    offer,
+    consumed: consumed2,
+    status,
+    metadata
+  };
+}
+function fromResponse(offerResponse) {
+  const { offer, consumed: consumed2, status, metadata } = offerResponse;
+  return {
+    ...offer,
+    consumed: consumed2,
+    status,
+    metadata
+  };
+}
+
 // src/core/index.ts
 var core_exports = {};
 __export(core_exports, {
@@ -8970,9 +8992,10 @@ async function get(config, parameters) {
     url.searchParams.set("limit", parameters.limit.toString());
   }
   const { cursor: returnedCursor, data: offers2 } = await getApi(config, url);
+  const routerOffers = offers2.map(mempool.Format.fromSnakeCase).map(fromResponse);
   return {
     cursor: returnedCursor,
-    offers: offers2.map(fromSnakeCase)
+    offers: routerOffers.map(from).map(toResponse)
   };
 }
 async function match(config, parameters) {
@@ -9011,9 +9034,10 @@ async function match(config, parameters) {
     url.searchParams.set("limit", parameters.limit.toString());
   }
   const { cursor: returnedCursor, data: offers2 } = await getApi(config, url);
+  const routerOffers = offers2.map(mempool.Format.fromSnakeCase).map(fromResponse);
   return {
     cursor: returnedCursor,
-    offers: offers2.map(fromSnakeCase)
+    offers: routerOffers.map(from).map(toResponse)
   };
 }
 async function getApi(config, url) {
@@ -9604,7 +9628,7 @@ function create2(config) {
           offering: offerData.offering,
           assets: offerData.assets,
           rate: offerData.rate,
-          maturity: offerData.maturity,
+          maturity: mempool.Maturity.from(offerData.maturity),
           expiry: offerData.expiry,
           start: offerData.start,
           nonce: offerData.nonce,
@@ -9823,7 +9847,7 @@ function create2(config) {
           offering: base2.offering,
           assets: base2.assets,
           rate: base2.rate,
-          maturity: base2.maturity,
+          maturity: mempool.Maturity.from(base2.maturity),
           expiry: base2.expiry,
           start: base2.start,
           nonce: base2.nonce,
@@ -9937,7 +9961,9 @@ async function serve(parameters) {
         }
       });
       return mempool.Mempool.success(c, {
-        data: offers2.offers.map((offer) => mempool.Format.stringifyBigint(mempool.Offer.toSnakeCase(offer))),
+        data: offers2.offers.map(
+          (offer) => mempool.Format.stringifyBigint(mempool.Format.toSnakeCase(toResponse(offer)))
+        ),
         cursor: offers2.nextCursor ?? null
       });
     } catch (err) {
@@ -9963,7 +9989,9 @@ async function serve(parameters) {
         limit: params.limit
       });
       return mempool.Mempool.success(c, {
-        data: offers2.offers.map((offer) => mempool.Format.stringifyBigint(mempool.Offer.toSnakeCase(offer))),
+        data: offers2.offers.map(
+          (offer) => mempool.Format.stringifyBigint(mempool.Format.toSnakeCase(toResponse(offer)))
+        ),
         cursor: offers2.nextCursor ?? null
       });
     } catch (err) {