feat: merge

Author: FedericoAmura

packages/schemas/src/lib/schemas.ts

@@ -710,34 +710,45 @@ export const IpfsOptionsSchema = z.object({
   gatewayUrl: z.string().startsWith('https://').endsWith('/ipfs/').optional(),
 });
 
-export const JsonExecutionSdkParamsSchema = LitActionSdkParamsSchema.pick({
-  jsParams: true,
-}).extend({
-  /**
-   *  JS code to run on the nodes
-   */
-  code: z.string().optional(), // TODO one or the other
-  /**
-   * The IPFS ID of some JS code to run on the nodes
-   */
-  ipfsId: z.string().optional(), // TODO one or the other
-  /**
-   * the session signatures to use to authorize the user with the nodes
-   */
-  sessionSigs: SessionSigsSchema,
-  /**
-   * auth methods to resolve
-   */
-  authMethods: z.array(AuthMethodSchema).optional(),
+export const ExecuteJsAdvancedOptionsSchema = z.object({
   /**
    * a strategy for processing `response` objects returned from the
    * Lit Action execution context
    */
   responseStrategy: LitActionResponseStrategySchema.optional(),
-
+  /**
+   * Allow overriding the default `code` property in the `JsonExecutionSdkParams`
+   */
   ipfsOptions: IpfsOptionsSchema.optional(),
+  /**
+   * Only run the action on a single node; this will only work if all code in your action is non-interactive
+   */
+  useSingleNode: z.boolean().optional(),
 });
 
+export const JsonExecutionSdkParamsSchema = LitActionSdkParamsSchema.pick({
+  jsParams: true,
+})
+  .merge(ExecuteJsAdvancedOptionsSchema)
+  .extend({
+    /**
+     *  JS code to run on the nodes
+     */
+    code: z.string().optional(), // TODO one or the other
+    /**
+     * The IPFS ID of some JS code to run on the nodes
+     */
+    ipfsId: z.string().optional(), // TODO one or the other
+    /**
+     * the session signatures to use to authorize the user with the nodes
+     */
+    sessionSigs: SessionSigsSchema,
+    /**
+     * auth methods to resolve
+     */
+    authMethods: z.array(AuthMethodSchema).optional(),
+  });
+
 export const SigResponseSchema = z.object({
   r: z.string(),
   s: z.string(),

packages/types/src/lib/interfaces.ts

@@ -41,6 +41,7 @@ import {
   NodeErrorV1Schema,
   RejectedNodePromisesSchema,
   NodeAttestationSchema,
+  ExecuteJsAdvancedOptionsSchema,
 } from '@lit-protocol/schemas';
 
 import { ILitNodeClient } from './ILitNodeClient';
@@ -355,47 +356,13 @@ export interface JsonExecutionSdkParamsTargetNode
   targetNodeRange: number;
 }
 
-export interface JsonExecutionSdkParams
-  extends Pick<LitActionSdkParams, 'jsParams'>,
-    ExecuteJsAdvancedOptions {
-  /**
-   *  JS code to run on the nodes
-   */
-  code?: string;
-
-  /**
-   * The IPFS ID of some JS code to run on the nodes
-   */
-  ipfsId?: string;
-
-  /**
-   * the session signatures to use to authorize the user with the nodes
-   */
-  sessionSigs: SessionSigsMap;
-
-  /**
-   * auth methods to resolve
-   */
-  authMethods?: AuthMethod[];
-}
-
-export interface ExecuteJsAdvancedOptions {
-  /**
-   * a strategy for proccessing `reponse` objects returned from the
-   * Lit Action execution context
-   */
-  responseStrategy?: LitActionResponseStrategy;
-
-  /**
-   * Allow overriding the default `code` property in the `JsonExecutionSdkParams`
-   */
-  ipfsOptions?: IpfsOptions;
+export type JsonExecutionSdkParams = z.infer<
+  typeof JsonExecutionSdkParamsSchema
+>;
 
-  /**
-   * Only run the action on a single node; this will only work if all code in your action is non-interactive
-   */
-  useSingleNode?: boolean;
-}
+export type ExecuteJsAdvancedOptions = z.infer<
+  typeof ExecuteJsAdvancedOptionsSchema
+>;
 
 export interface JsonExecutionRequestTargetNode extends JsonExecutionRequest {
   targetNodeRange: number;