Refactor tests

packages/@tests/aqua/src/_aqua/finalize_particle.ts

@@ -9,13 +9,16 @@
  * If you find any bugs in generated JS/TS, please write an issue on GitHub: https://github.com/fluencelabs/js-client/issues
  *
  */
-import type { IFluenceClient as IFluenceClient$$, ParticleContext as ParticleContext$$ } from '@fluencelabs/js-client';
+import type {
+  IFluenceClient as IFluenceClient$$,
+  ParticleContext as ParticleContext$$,
+} from "@fluencelabs/js-client";
 
 import {
   v5_callFunction as callFunction$$,
   v5_registerService as registerService$$,
-    FluencePeer as FluencePeer$$
+  FluencePeer as FluencePeer$$,
-} from '@fluencelabs/js-client';
+} from "@fluencelabs/js-client";
 
 /**
  * @typedef {import("@fluencelabs/js-client").NonArrowSimpleType} NonArrowSimpleType
@@ -30,40 +33,36 @@ import {
 export function aqua2ts(value, schema) {
   if (schema.tag === "nil") {
     return null;
-    }
+  } else if (schema.tag === "option") {
-    else if (schema.tag === "option") {
     if (!Array.isArray(value)) {
       throw new Error("Bad schema");
     }
     if (value.length === 0) {
       return null;
-        }
+    } else {
-        else {
       return aqua2ts(value[0], schema.type);
     }
-    }
+  } else if (
-    else if (schema.tag === "scalar" ||
+    schema.tag === "scalar" ||
     schema.tag === "bottomType" ||
-        schema.tag === "topType") {
+    schema.tag === "topType"
+  ) {
     return value;
-    }
+  } else if (schema.tag === "array") {
-    else if (schema.tag === "array") {
     if (!Array.isArray(value)) {
       throw new Error("Bad schema");
     }
     return value.map((y) => {
       return aqua2ts(y, schema.type);
     });
-    }
+  } else if (schema.tag === "unlabeledProduct") {
-    else if (schema.tag === "unlabeledProduct") {
     if (!Array.isArray(value)) {
       throw new Error("Bad schema");
     }
     return value.map((y, i) => {
       return aqua2ts(y, schema.items[i]);
     });
-    }
+  } else if (schema.tag === "struct" || schema.tag === "labeledProduct") {
-    else if (schema.tag === "struct" || schema.tag === "labeledProduct") {
     if (typeof value !== "object" || value == null || Array.isArray(value)) {
       throw new Error("Bad schema");
     }
@@ -71,8 +70,7 @@ export function aqua2ts(value, schema) {
       const val = aqua2ts(value[key], type);
       return { ...agg, [key]: val };
     }, {});
-    }
+  } else {
-    else {
     throw new Error("Unexpected tag: " + JSON.stringify(schema));
   }
 }
@@ -85,35 +83,32 @@ export function aqua2ts(value, schema) {
 export function ts2aqua(value, schema) {
   if (schema.tag === "nil") {
     return null;
-    }
+  } else if (schema.tag === "option") {
-    else if (schema.tag === "option") {
     if (!Array.isArray(value)) {
       throw new Error("Bad schema");
     }
     return value === null ? [] : [ts2aqua(value, schema.type)];
-    }
+  } else if (
-    else if (schema.tag === "scalar" ||
+    schema.tag === "scalar" ||
     schema.tag === "bottomType" ||
-        schema.tag === "topType") {
+    schema.tag === "topType"
+  ) {
     return value;
-    }
+  } else if (schema.tag === "array") {
-    else if (schema.tag === "array") {
     if (!Array.isArray(value)) {
       throw new Error("Bad schema");
     }
     return value.map((y) => {
       return ts2aqua(y, schema.type);
     });
-    }
+  } else if (schema.tag === "unlabeledProduct") {
-    else if (schema.tag === "unlabeledProduct") {
     if (!Array.isArray(value)) {
       throw new Error("Bad schema");
     }
     return value.map((y, i) => {
       return ts2aqua(y, schema.items[i]);
     });
-    }
+  } else if (schema.tag === "struct" || schema.tag === "labeledProduct") {
-    else if (schema.tag === "struct" || schema.tag === "labeledProduct") {
     if (typeof value !== "object" || value == null || Array.isArray(value)) {
       throw new Error("Bad schema");
     }
@@ -121,14 +116,11 @@ export function ts2aqua(value, schema) {
       const val = ts2aqua(value[key], type);
       return { ...agg, [key]: val };
     }, {});
-    }
+  } else {
-    else {
     throw new Error("Unexpected tag: " + JSON.stringify(schema));
   }
 }
 
-
-
 // Functions
 export const test_script = `
 (seq
@@ -143,13 +135,11 @@ export const test_script = `
 )
 `;
 
-export function test(
+export function test(config?: { ttl?: number }): Promise<void>;
-    config?: {ttl?: number}
-): Promise<void>;
 
 export function test(
   peer: IFluenceClient$$,
-    config?: {ttl?: number}
+  config?: { ttl?: number },
 ): Promise<void>;
 
 export async function test(...args: any[]) {
@@ -161,23 +151,22 @@ export async function test(...args: any[]) {
     args = args.slice(1);
   }
 
+  const callArgs = Object.fromEntries(
+    args.slice(0, argCount).map((arg, i) => [argNames[i], arg]),
+  );
 
-    const callArgs = Object.fromEntries(args.slice(0, argCount).map((arg, i) => [argNames[i], arg]));
+  const params = {
-    
-    const params = ({
     peer,
     args: callArgs,
-        config: args[argCount]
+    config: args[argCount],
-    });
+  };
 
   const result = await callFunction$$({
     script: test_script,
     ...params,
   });
 
-    return aqua2ts(result, 
+  return aqua2ts(result, {
-    {
+    tag: "nil",
-    "tag": "nil"
+  });
-}
-    ); 
 }

packages/@tests/aqua/src/_aqua/smoke_test.ts

@@ -9,13 +9,16 @@
  * If you find any bugs in generated JS/TS, please write an issue on GitHub: https://github.com/fluencelabs/js-client/issues
  *
  */
-import type { IFluenceClient as IFluenceClient$$, ParticleContext as ParticleContext$$ } from '@fluencelabs/js-client';
+import type {
+  IFluenceClient as IFluenceClient$$,
+  ParticleContext as ParticleContext$$,
+} from "@fluencelabs/js-client";
 
 import {
   v5_callFunction as callFunction$$,
   v5_registerService as registerService$$,
-    FluencePeer as FluencePeer$$
+  FluencePeer as FluencePeer$$,
-} from '@fluencelabs/js-client';
+} from "@fluencelabs/js-client";
 
 /**
  * @typedef {import("@fluencelabs/js-client").NonArrowSimpleType} NonArrowSimpleType
@@ -30,40 +33,36 @@ import {
 export function aqua2ts(value, schema) {
   if (schema.tag === "nil") {
     return null;
-    }
+  } else if (schema.tag === "option") {
-    else if (schema.tag === "option") {
     if (!Array.isArray(value)) {
       throw new Error("Bad schema");
     }
     if (value.length === 0) {
       return null;
-        }
+    } else {
-        else {
       return aqua2ts(value[0], schema.type);
     }
-    }
+  } else if (
-    else if (schema.tag === "scalar" ||
+    schema.tag === "scalar" ||
     schema.tag === "bottomType" ||
-        schema.tag === "topType") {
+    schema.tag === "topType"
+  ) {
     return value;
-    }
+  } else if (schema.tag === "array") {
-    else if (schema.tag === "array") {
     if (!Array.isArray(value)) {
       throw new Error("Bad schema");
     }
     return value.map((y) => {
       return aqua2ts(y, schema.type);
     });
-    }
+  } else if (schema.tag === "unlabeledProduct") {
-    else if (schema.tag === "unlabeledProduct") {
     if (!Array.isArray(value)) {
       throw new Error("Bad schema");
     }
     return value.map((y, i) => {
       return aqua2ts(y, schema.items[i]);
     });
-    }
+  } else if (schema.tag === "struct" || schema.tag === "labeledProduct") {
-    else if (schema.tag === "struct" || schema.tag === "labeledProduct") {
     if (typeof value !== "object" || value == null || Array.isArray(value)) {
       throw new Error("Bad schema");
     }
@@ -71,8 +70,7 @@ export function aqua2ts(value, schema) {
       const val = aqua2ts(value[key], type);
       return { ...agg, [key]: val };
     }, {});
-    }
+  } else {
-    else {
     throw new Error("Unexpected tag: " + JSON.stringify(schema));
   }
 }
@@ -85,35 +83,32 @@ export function aqua2ts(value, schema) {
 export function ts2aqua(value, schema) {
   if (schema.tag === "nil") {
     return null;
-    }
+  } else if (schema.tag === "option") {
-    else if (schema.tag === "option") {
     if (!Array.isArray(value)) {
       throw new Error("Bad schema");
     }
     return value === null ? [] : [ts2aqua(value, schema.type)];
-    }
+  } else if (
-    else if (schema.tag === "scalar" ||
+    schema.tag === "scalar" ||
     schema.tag === "bottomType" ||
-        schema.tag === "topType") {
+    schema.tag === "topType"
+  ) {
     return value;
-    }
+  } else if (schema.tag === "array") {
-    else if (schema.tag === "array") {
     if (!Array.isArray(value)) {
       throw new Error("Bad schema");
     }
     return value.map((y) => {
       return ts2aqua(y, schema.type);
     });
-    }
+  } else if (schema.tag === "unlabeledProduct") {
-    else if (schema.tag === "unlabeledProduct") {
     if (!Array.isArray(value)) {
       throw new Error("Bad schema");
     }
     return value.map((y, i) => {
       return ts2aqua(y, schema.items[i]);
     });
-    }
+  } else if (schema.tag === "struct" || schema.tag === "labeledProduct") {
-    else if (schema.tag === "struct" || schema.tag === "labeledProduct") {
     if (typeof value !== "object" || value == null || Array.isArray(value)) {
       throw new Error("Bad schema");
     }
@@ -121,34 +116,53 @@ export function ts2aqua(value, schema) {
       const val = ts2aqua(value[key], type);
       return { ...agg, [key]: val };
     }, {});
-    }
+  } else {
-    else {
     throw new Error("Unexpected tag: " + JSON.stringify(schema));
   }
 }
 
-
 // Services
 export interface SrvDef {
-    create: (wasm_b64_content: string, callParams: ParticleContext$$) => { error: string | null; service_id: string | null; success: boolean; } | Promise<{ error: string | null; service_id: string | null; success: boolean; }>;
+  create: (
+    wasm_b64_content: string,
+    callParams: ParticleContext$$,
+  ) =>
+    | { error: string | null; service_id: string | null; success: boolean }
+    | Promise<{
+        error: string | null;
+        service_id: string | null;
+        success: boolean;
+      }>;
   list: (callParams: ParticleContext$$) => string[] | Promise<string[]>;
-    remove: (service_id: string, callParams: ParticleContext$$) => { error: string | null; success: boolean; } | Promise<{ error: string | null; success: boolean; }>;
+  remove: (
+    service_id: string,
+    callParams: ParticleContext$$,
+  ) =>
+    | { error: string | null; success: boolean }
+    | Promise<{ error: string | null; success: boolean }>;
 }
 export function registerSrv(service: SrvDef): void;
 export function registerSrv(serviceId: string, service: SrvDef): void;
 export function registerSrv(peer: IFluenceClient$$, service: SrvDef): void;
-export function registerSrv(peer: IFluenceClient$$, serviceId: string, service: SrvDef): void;
+export function registerSrv(
+  peer: IFluenceClient$$,
+  serviceId: string,
+  service: SrvDef,
+): void;
 export function registerSrv(...args: any[]) {
   const service = args.pop();
   const defaultServiceId = "single_module_srv";
 
-    const params = args[0] instanceof FluencePeer$$ ? ({
+  const params =
+    args[0] instanceof FluencePeer$$
+      ? {
           peer: args[0],
-        serviceId: args[1] ?? defaultServiceId
+          serviceId: args[1] ?? defaultServiceId,
-    }) : ({
+        }
+      : {
           peer: undefined,
-        serviceId: args[0] ?? defaultServiceId
+          serviceId: args[0] ?? defaultServiceId,
-    });
+        };
 
   if (params.serviceId == null) {
     throw new Error("Service ID is not provided");
@@ -156,32 +170,51 @@ export function registerSrv(...args: any[]) {
 
   registerService$$({
     service,
-        ...params
+    ...params,
   });
 }
 
 export interface CalcServiceDef {
-    divide: (num: number, callParams: ParticleContext$$) => number | Promise<number>;
+  divide: (
+    num: number,
+    callParams: ParticleContext$$,
+  ) => number | Promise<number>;
   clear_state: (callParams: ParticleContext$$) => void | Promise<void>;
   test_logs: (callParams: ParticleContext$$) => void | Promise<void>;
-    multiply: (num: number, callParams: ParticleContext$$) => number | Promise<number>;
+  multiply: (
+    num: number,
+    callParams: ParticleContext$$,
+  ) => number | Promise<number>;
   add: (num: number, callParams: ParticleContext$$) => number | Promise<number>;
   state: (callParams: ParticleContext$$) => number | Promise<number>;
-    subtract: (num: number, callParams: ParticleContext$$) => number | Promise<number>;
+  subtract: (
+    num: number,
+    callParams: ParticleContext$$,
+  ) => number | Promise<number>;
 }
-export function registerCalcService(serviceId: string, service: CalcServiceDef): void;
+export function registerCalcService(
-export function registerCalcService(peer: IFluenceClient$$, serviceId: string, service: CalcServiceDef): void;
+  serviceId: string,
+  service: CalcServiceDef,
+): void;
+export function registerCalcService(
+  peer: IFluenceClient$$,
+  serviceId: string,
+  service: CalcServiceDef,
+): void;
 export function registerCalcService(...args: any[]) {
   const service = args.pop();
   const defaultServiceId = undefined;
 
-    const params = args[0] instanceof FluencePeer$$ ? ({
+  const params =
+    args[0] instanceof FluencePeer$$
+      ? {
           peer: args[0],
-        serviceId: args[1] ?? defaultServiceId
+          serviceId: args[1] ?? defaultServiceId,
-    }) : ({
+        }
+      : {
           peer: undefined,
-        serviceId: args[0] ?? defaultServiceId
+          serviceId: args[0] ?? defaultServiceId,
-    });
+        };
 
   if (params.serviceId == null) {
     throw new Error("Service ID is not provided");
@@ -189,28 +222,44 @@ export function registerCalcService(...args: any[]) {
 
   registerService$$({
     service,
-        ...params
+    ...params,
   });
 }
 
 export interface HelloWorldDef {
-    hello: (str: string, callParams: ParticleContext$$) => string | Promise<string>;
+  hello: (
+    str: string,
+    callParams: ParticleContext$$,
+  ) => string | Promise<string>;
 }
 export function registerHelloWorld(service: HelloWorldDef): void;
-export function registerHelloWorld(serviceId: string, service: HelloWorldDef): void;
+export function registerHelloWorld(
-export function registerHelloWorld(peer: IFluenceClient$$, service: HelloWorldDef): void;
+  serviceId: string,
-export function registerHelloWorld(peer: IFluenceClient$$, serviceId: string, service: HelloWorldDef): void;
+  service: HelloWorldDef,
+): void;
+export function registerHelloWorld(
+  peer: IFluenceClient$$,
+  service: HelloWorldDef,
+): void;
+export function registerHelloWorld(
+  peer: IFluenceClient$$,
+  serviceId: string,
+  service: HelloWorldDef,
+): void;
 export function registerHelloWorld(...args: any[]) {
   const service = args.pop();
   const defaultServiceId = "hello-world";
 
-    const params = args[0] instanceof FluencePeer$$ ? ({
+  const params =
+    args[0] instanceof FluencePeer$$
+      ? {
           peer: args[0],
-        serviceId: args[1] ?? defaultServiceId
+          serviceId: args[1] ?? defaultServiceId,
-    }) : ({
+        }
+      : {
           peer: undefined,
-        serviceId: args[0] ?? defaultServiceId
+          serviceId: args[0] ?? defaultServiceId,
-    });
+        };
 
   if (params.serviceId == null) {
     throw new Error("Service ID is not provided");
@@ -218,11 +267,10 @@ export function registerHelloWorld(...args: any[]) {
 
   registerService$$({
     service,
-        ...params
+    ...params,
   });
 }
 
-
 // Functions
 export const resourceTest_script = `
 (seq
@@ -447,17 +495,17 @@ export const resourceTest_script = `
 )
 `;
 
-export type ResourceTestResult = [string | null, string[]]
+export type ResourceTestResult = [string | null, string[]];
 
 export function resourceTest(
   label: string,
-    config?: {ttl?: number}
+  config?: { ttl?: number },
 ): Promise<ResourceTestResult>;
 
 export function resourceTest(
   peer: IFluenceClient$$,
   label: string,
-    config?: {ttl?: number}
+  config?: { ttl?: number },
 ): Promise<ResourceTestResult>;
 
 export async function resourceTest(...args: any[]) {
@@ -469,41 +517,40 @@ export async function resourceTest(...args: any[]) {
     args = args.slice(1);
   }
 
+  const callArgs = Object.fromEntries(
+    args.slice(0, argCount).map((arg, i) => [argNames[i], arg]),
+  );
 
-    const callArgs = Object.fromEntries(args.slice(0, argCount).map((arg, i) => [argNames[i], arg]));
+  const params = {
-    
-    const params = ({
     peer,
     args: callArgs,
-        config: args[argCount]
+    config: args[argCount],
-    });
+  };
 
   const result = await callFunction$$({
     script: resourceTest_script,
     ...params,
   });
 
-    return aqua2ts(result, 
+  return aqua2ts(result, {
+    items: [
       {
-    "items": [
+        type: {
-        {
+          name: "string",
-            "type": {
+          tag: "scalar",
-                "name": "string",
-                "tag": "scalar"
         },
-            "tag": "option"
+        tag: "option",
       },
       {
-            "type": {
+        type: {
-                "name": "string",
+          name: "string",
-                "tag": "scalar"
+          tag: "scalar",
+        },
+        tag: "array",
       },
-            "tag": "array"
-        }
     ],
-    "tag": "unlabeledProduct"
+    tag: "unlabeledProduct",
-}
+  });
-    ); 
 }
 
 export const helloTest_script = `
@@ -519,13 +566,11 @@ export const helloTest_script = `
 )
 `;
 
-export function helloTest(
+export function helloTest(config?: { ttl?: number }): Promise<string>;
-    config?: {ttl?: number}
-): Promise<string>;
 
 export function helloTest(
   peer: IFluenceClient$$,
-    config?: {ttl?: number}
+  config?: { ttl?: number },
 ): Promise<string>;
 
 export async function helloTest(...args: any[]) {
@@ -537,26 +582,25 @@ export async function helloTest(...args: any[]) {
     args = args.slice(1);
   }
 
+  const callArgs = Object.fromEntries(
+    args.slice(0, argCount).map((arg, i) => [argNames[i], arg]),
+  );
 
-    const callArgs = Object.fromEntries(args.slice(0, argCount).map((arg, i) => [argNames[i], arg]));
+  const params = {
-    
-    const params = ({
     peer,
     args: callArgs,
-        config: args[argCount]
+    config: args[argCount],
-    });
+  };
 
   const result = await callFunction$$({
     script: helloTest_script,
     ...params,
   });
 
-    return aqua2ts(result, 
+  return aqua2ts(result, {
-    {
+    name: "string",
-    "name": "string",
+    tag: "scalar",
-    "tag": "scalar"
+  });
-}
-    ); 
 }
 
 export const callHappy_script = `
@@ -589,7 +633,7 @@ export function callHappy(
   b: number,
   c: number,
   d: (arg0: string) => number | Promise<number>,
-    config?: {ttl?: number}
+  config?: { ttl?: number },
 ): Promise<number>;
 
 export function callHappy(
@@ -598,7 +642,7 @@ export function callHappy(
   b: number,
   c: number,
   d: (arg0: string) => number | Promise<number>,
-    config?: {ttl?: number}
+  config?: { ttl?: number },
 ): Promise<number>;
 
 export async function callHappy(...args: any[]) {
@@ -610,26 +654,25 @@ export async function callHappy(...args: any[]) {
     args = args.slice(1);
   }
 
+  const callArgs = Object.fromEntries(
+    args.slice(0, argCount).map((arg, i) => [argNames[i], arg]),
+  );
 
-    const callArgs = Object.fromEntries(args.slice(0, argCount).map((arg, i) => [argNames[i], arg]));
+  const params = {
-    
-    const params = ({
     peer,
     args: callArgs,
-        config: args[argCount]
+    config: args[argCount],
-    });
+  };
 
   const result = await callFunction$$({
     script: callHappy_script,
     ...params,
   });
 
-    return aqua2ts(result, 
+  return aqua2ts(result, {
-    {
+    name: "f64",
-    "name": "f64",
+    tag: "scalar",
-    "tag": "scalar"
+  });
-}
-    ); 
 }
 
 export const demo_calculation_script = `
@@ -665,13 +708,13 @@ export const demo_calculation_script = `
 
 export function demo_calculation(
   service_id: string,
-    config?: {ttl?: number}
+  config?: { ttl?: number },
 ): Promise<number>;
 
 export function demo_calculation(
   peer: IFluenceClient$$,
   service_id: string,
-    config?: {ttl?: number}
+  config?: { ttl?: number },
 ): Promise<number>;
 
 export async function demo_calculation(...args: any[]) {
@@ -683,26 +726,25 @@ export async function demo_calculation(...args: any[]) {
     args = args.slice(1);
   }
 
+  const callArgs = Object.fromEntries(
+    args.slice(0, argCount).map((arg, i) => [argNames[i], arg]),
+  );
 
-    const callArgs = Object.fromEntries(args.slice(0, argCount).map((arg, i) => [argNames[i], arg]));
+  const params = {
-    
-    const params = ({
     peer,
     args: callArgs,
-        config: args[argCount]
+    config: args[argCount],
-    });
+  };
 
   const result = await callFunction$$({
     script: demo_calculation_script,
     ...params,
   });
 
-    return aqua2ts(result, 
+  return aqua2ts(result, {
-    {
+    name: "f64",
-    "name": "f64",
+    tag: "scalar",
-    "tag": "scalar"
+  });
-}
-    ); 
 }
 
 export const marineTest_script = `
@@ -741,13 +783,13 @@ export const marineTest_script = `
 
 export function marineTest(
   wasm64: string,
-    config?: {ttl?: number}
+  config?: { ttl?: number },
 ): Promise<number>;
 
 export function marineTest(
   peer: IFluenceClient$$,
   wasm64: string,
-    config?: {ttl?: number}
+  config?: { ttl?: number },
 ): Promise<number>;
 
 export async function marineTest(...args: any[]) {
@@ -759,24 +801,23 @@ export async function marineTest(...args: any[]) {
     args = args.slice(1);
   }
 
+  const callArgs = Object.fromEntries(
+    args.slice(0, argCount).map((arg, i) => [argNames[i], arg]),
+  );
 
-    const callArgs = Object.fromEntries(args.slice(0, argCount).map((arg, i) => [argNames[i], arg]));
+  const params = {
-    
-    const params = ({
     peer,
     args: callArgs,
-        config: args[argCount]
+    config: args[argCount],
-    });
+  };
 
   const result = await callFunction$$({
     script: marineTest_script,
     ...params,
   });
 
-    return aqua2ts(result, 
+  return aqua2ts(result, {
-    {
+    name: "f64",
-    "name": "f64",
+    tag: "scalar",
-    "tag": "scalar"
+  });
-}
-    ); 
 }

packages/core/aqua-to-js/src/generate/__test__/conversion.spec.ts

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { JSONValue, NonArrowType } from "@fluencelabs/interfaces";
+import { JSONValue, NonArrowSimpleType } from "@fluencelabs/interfaces";
 import { it, describe, expect, test } from "vitest";
 
-import { aqua2ts, ts2aqua } from "../conversions.js";
+import { aqua2ts, ts2aqua } from "../converters.js";
 
 const i32 = { tag: "scalar", name: "i32" } as const;
 
@@ -172,7 +172,7 @@ const nestedStructs = [
 interface ConversionTestArgs {
   aqua: JSONValue;
   ts: JSONValue;
-  type: NonArrowType;
+  type: NonArrowSimpleType;
 }
 
 describe("Conversion from aqua to typescript", () => {

packages/core/aqua-to-js/src/generate/converters.js

@@ -68,11 +68,7 @@ export function ts2aqua(value, schema) {
   if (schema.tag === "nil") {
     return null;
   } else if (schema.tag === "option") {
-    if (!Array.isArray(value)) {
+    return value == null ? [] : [ts2aqua(value, schema.type)];
-      throw new Error("Bad schema");
-    }
-
-    return value === null ? [] : [ts2aqua(value, schema.type)];
   } else if (
     schema.tag === "scalar" ||
     schema.tag === "bottomType" ||

packages/core/js-client/package.json

@@ -55,7 +55,6 @@
     "libp2p": "0.46.6",
     "multiformats": "11.0.1",
     "rxjs": "7.5.5",
-    "ts-pattern": "3.3.3",
     "uint8arrays": "4.0.3",
     "uuid": "8.3.2",
     "zod": "3.22.4"

packages/core/js-client/src/particle/Particle.ts

@@ -15,17 +15,17 @@
  */
 
 import { CallResultsArray } from "@fluencelabs/avm";
+import { JSONValue } from "@fluencelabs/interfaces";
 import { fromUint8Array, toUint8Array } from "js-base64";
 import { concat } from "uint8arrays/concat";
 import { v4 as uuidv4 } from "uuid";
 import { z } from "zod";
 
+import { ExpirationError } from "../jsPeer/errors.js";
 import { KeyPair } from "../keypair/index.js";
 import { numberToLittleEndianBytes } from "../util/bytes.js";
 
 import { IParticle } from "./interfaces.js";
-import { JSONValue } from "@fluencelabs/interfaces";
-import { ExpirationError } from "../jsPeer/errors.js";
 
 const particleSchema = z.object({
   id: z.string(),

packages/core/js-client/src/services/__test__/jsonBuiltin.spec.ts

@@ -71,6 +71,7 @@ describe("Sig service test suite", () => {
     });
 
     const p = await peer.internals.createNewParticle(script);
+
     peer.internals.initiateParticle(
       p,
       () => {},

pnpm-lock.yaml

@@ -280,9 +280,6 @@ importers:
       rxjs:
         specifier: 7.5.5
         version: 7.5.5
-      ts-pattern:
-        specifier: 3.3.3
-        version: 3.3.3
       uint8arrays:
         specifier: 4.0.3
         version: 4.0.3
@@ -14060,10 +14057,6 @@ packages:
       yn: 3.1.1
     dev: true
 
-  /ts-pattern@3.3.3:
-    resolution: {integrity: sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==}
-    dev: false
-
   /ts-pattern@5.0.5:
     resolution: {integrity: sha512-tL0w8U/pgaacOmkb9fRlYzWEUDCfVjjv9dD4wHTgZ61MjhuMt46VNWTG747NqW6vRzoWIKABVhFSOJ82FvXrfA==}
     dev: true