chore: fix tests

Author: dOrgJelli

packages/client/src/PolywrapClient.ts

@@ -1,5 +1,4 @@
 import { InvokerOptions, TryResolveUriOptions } from "./types";
-import { ClientConfigBuilder } from ".";
 
 import { PolywrapCoreClient } from "@polywrap/core-client-js";
 import {
@@ -25,6 +24,7 @@ import {
   WrapManifest,
 } from "@polywrap/wrap-manifest-types-js";
 import { Tracer, TracerConfig } from "@polywrap/tracing-js";
+import { ClientConfigBuilder } from "@polywrap/client-config-builder-js";
 
 export class PolywrapClient extends PolywrapCoreClient {
   // $start: PolywrapClient-constructor

packages/client/src/__tests__/core/error-structure.spec.ts

@@ -266,7 +266,7 @@ describe("Error structure", () => {
         });
 
         afterAll(() => {
-          fs.rmdirSync("tmp", { recursive: true });
+          fs.rmSync("tmp", { recursive: true });
         });
       });
     });
@@ -415,7 +415,7 @@ describe("Error structure", () => {
       test("Invoke a plugin wrapper with malformed args", async () => {
         const client = await createClient();
         const result = await client.invoke<Uint8Array>({
-          uri: SysNodeBundle.plugins.fileSystem.uri,
+          uri: SysNodeBundle.bundle.fileSystem.uri,
           method: "readFile",
           args: {
             pathh: "packages/client/src/__tests__/core/index.ts",
@@ -432,7 +432,7 @@ describe("Error structure", () => {
         expect(result.error?.reason).toEqual(
           'The "path" argument must be of type string or an instance of Buffer or URL. Received undefined'
         );
-        expect(result.error?.uri).toEqual(Uri.from(SysNodeBundle.plugins.fileSystem.uri).uri);
+        expect(result.error?.uri).toEqual(Uri.from(SysNodeBundle.bundle.fileSystem.uri).uri);
         expect(result.error?.method).toEqual("readFile");
         expect(result.error?.args).toContain(
           '{\n  "pathh": "packages/client/src/__tests__/core/index.ts"\n}'
@@ -445,7 +445,7 @@ describe("Error structure", () => {
       test("Invoke a plugin wrapper with a method that doesn't exist", async () => {
         const client = await createClient();
         const result = await client.invoke<Uint8Array>({
-          uri: SysNodeBundle.plugins.fileSystem.uri,
+          uri: SysNodeBundle.bundle.fileSystem.uri,
           method: "readFileNotFound",
           args: {
             path: __dirname + "/index.ts",
@@ -462,7 +462,7 @@ describe("Error structure", () => {
         expect(
           result.error?.reason.startsWith("Plugin missing method ")
         ).toBeTruthy();
-        expect(result.error?.uri).toEqual(Uri.from(SysNodeBundle.plugins.fileSystem.uri).uri);
+        expect(result.error?.uri).toEqual(Uri.from(SysNodeBundle.bundle.fileSystem.uri).uri);
         expect(result.error?.method).toEqual("readFileNotFound");
       });
 
@@ -494,7 +494,7 @@ describe("Error structure", () => {
       test("Invoke a plugin wrapper that throws unexpectedly", async () => {
         const client = await createClient();
         const result = await client.invoke<Uint8Array>({
-          uri: SysNodeBundle.plugins.fileSystem.uri,
+          uri: SysNodeBundle.bundle.fileSystem.uri,
           method: "readFile",
           args: {
             path: "./this/path/does/not/exist.ts",
@@ -511,7 +511,7 @@ describe("Error structure", () => {
         expect(
           result.error?.reason.startsWith("ENOENT: no such file or directory")
         ).toBeTruthy();
-        expect(result.error?.uri).toEqual(Uri.from(SysNodeBundle.plugins.fileSystem.uri).uri);
+        expect(result.error?.uri).toEqual(Uri.from(SysNodeBundle.bundle.fileSystem.uri).uri);
         expect(result.error?.method).toEqual("readFile");
         expect(result.error?.args).toEqual(
           '{\n  "path": "./this/path/does/not/exist.ts"\n}'

packages/client/src/__tests__/core/plugin-wrapper.spec.ts

@@ -1,5 +1,5 @@
 import { PolywrapClient } from "../..";
-import { Uri } from "@polywrap/core-js";
+import { IWrapPackage, Uri } from "@polywrap/core-js";
 import { WrapManifest } from "@polywrap/wrap-manifest-types-js";
 import { PluginPackage, PluginModule } from "@polywrap/plugin-js";
 import { UriResolver } from "@polywrap/uri-resolvers-js";
@@ -81,11 +81,14 @@ describe("plugin-wrapper", () => {
     const client = new PolywrapClient(
       {
         resolver: UriResolver.from([
-          { uri: Uri.from(SysBundle.plugins.http.uri), package: SysBundle.plugins.http.plugin },
+          {
+            uri: Uri.from(SysBundle.bundle.http.uri),
+            package: SysBundle.bundle.http.package as IWrapPackage
+          },
         ]),
       }
     );
-    const manifest = await client.getManifest(SysBundle.plugins.http.uri);
+    const manifest = await client.getManifest(SysBundle.bundle.http.uri);
     if (!manifest.ok) fail(manifest.error);
     expect(manifest.value.type).toEqual("plugin");
     expect(manifest.value.name).toEqual("Http");

packages/client/src/__tests__/core/wasm-wrapper.spec.ts

@@ -116,14 +116,13 @@ describe("wasm-wrapper", () => {
   });
 
   it("should allow clone + reconfigure of redirects", async () => {
-    let config = new ClientConfigBuilder()
+    let builder = new ClientConfigBuilder()
       .add({
         packages: { "wrap://ens/mock.polywrap.eth": mockPlugin() },
       })
-      .addDefaults()
-      .build();
+      .addDefaults();
 
-    const client = new PolywrapClient(config);
+    const client = new PolywrapClient(builder.build());
 
     const clientResult = await client.invoke({
       uri: wrapperUri.uri,

packages/config-bundles/sys/src/node.ts

@@ -1,7 +1,7 @@
 import * as Common from "./common";
 
 import { Bundle } from "@polywrap/config-bundle-types-js";
-import Node from "@polywrap/sys-node-config-bundle-js";
+import * as Node from "@polywrap/sys-node-config-bundle-js";
 
 export const bundle: Bundle = {
   ...Common.bundle,

packages/manifests/wrap/scripts/templates/validate-ts.mustache

@@ -15,7 +15,7 @@ import {
 
 import Ajv, { Schema } from "ajv";
 
-const ajv = new Ajv();
+const ajv = new Ajv({ strict: false });
 
 type WrapManifestSchemas = {
   [key in WrapManifestVersions]: Schema | undefined

packages/manifests/wrap/src/formats/wrap.info/validate.ts

@@ -13,7 +13,7 @@ import {
 
 import Ajv, { Schema } from "ajv";
 
-const ajv = new Ajv();
+const ajv = new Ajv({ strict: false });
 
 type WrapManifestSchemas = {
   [key in WrapManifestVersions]: Schema | undefined