diff --git a/CHANGELOG.md b/CHANGELOG.md index 195651d650..2ccbd5909d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Polywrap Origin (0.10.0-pre.11) +# Polywrap Origin (0.10.0-pre.12) ## Breaking Changes ### Toolchain **`polywrap` CLI:** diff --git a/VERSION b/VERSION index f573c7b1d4..b1a967166e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.10.0-pre.11 +0.10.0-pre.12 diff --git a/packages/cli/package.json b/packages/cli/package.json index da8734d15e..7e4857c47b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "polywrap", "description": "Polywrap CLI", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -43,22 +43,22 @@ "@ethersproject/providers": "5.6.8", "@ethersproject/wallet": "5.6.2", "@formatjs/intl": "1.8.2", - "@polywrap/asyncify-js": "0.10.0-pre.11", - "@polywrap/client-config-builder-js": "0.10.0-pre.11", - "@polywrap/client-js": "0.10.0-pre.11", - "@polywrap/core-js": "0.10.0-pre.11", + "@polywrap/asyncify-js": "0.10.0-pre.12", + "@polywrap/client-config-builder-js": "0.10.0-pre.12", + "@polywrap/client-js": "0.10.0-pre.12", + "@polywrap/core-js": "0.10.0-pre.12", "@polywrap/ethereum-provider-js": "~0.2.3", - "@polywrap/logging-js": "0.10.0-pre.11", - "@polywrap/os-js": "0.10.0-pre.11", - "@polywrap/polywrap-manifest-types-js": "0.10.0-pre.11", - "@polywrap/result": "0.10.0-pre.11", - "@polywrap/schema-bind": "0.10.0-pre.11", - "@polywrap/schema-compose": "0.10.0-pre.11", - "@polywrap/schema-parse": "0.10.0-pre.11", - "@polywrap/uri-resolver-extensions-js": "0.10.0-pre.11", - "@polywrap/uri-resolvers-js": "0.10.0-pre.11", - "@polywrap/wasm-js": "0.10.0-pre.11", - "@polywrap/wrap-manifest-types-js": "0.10.0-pre.11", + "@polywrap/logging-js": "0.10.0-pre.12", + "@polywrap/os-js": "0.10.0-pre.12", + "@polywrap/polywrap-manifest-types-js": "0.10.0-pre.12", + "@polywrap/result": "0.10.0-pre.12", + "@polywrap/schema-bind": "0.10.0-pre.12", + "@polywrap/schema-compose": "0.10.0-pre.12", + "@polywrap/schema-parse": "0.10.0-pre.12", + "@polywrap/uri-resolver-extensions-js": "0.10.0-pre.12", + "@polywrap/uri-resolvers-js": "0.10.0-pre.12", + "@polywrap/wasm-js": "0.10.0-pre.12", + "@polywrap/wrap-manifest-types-js": "0.10.0-pre.12", "axios": "0.21.2", "chalk": "4.1.0", "chokidar": "3.5.1", @@ -82,7 +82,7 @@ "yesno": "0.4.0" }, "devDependencies": { - "@polywrap/cli-js": "0.10.0-pre.11", + "@polywrap/cli-js": "0.10.0-pre.12", "@types/copyfiles": "2.4.0", "@types/fs-extra": "9.0.12", "@types/jest": "26.0.8", diff --git a/packages/cli/src/__tests__/e2e/build.plugin.spec.ts b/packages/cli/src/__tests__/e2e/build.plugin.spec.ts index 977f46b79a..942756bf29 100644 --- a/packages/cli/src/__tests__/e2e/build.plugin.spec.ts +++ b/packages/cli/src/__tests__/e2e/build.plugin.spec.ts @@ -35,7 +35,6 @@ describe("e2e tests for build command - plugin project", () => { test(testCaseName, async () => { const { exitCode: code, stdout: output, stderr: error } = await Commands.build({ ...args, - codegen: true, }, { cwd: testCaseDir, }); diff --git a/packages/cli/src/__tests__/e2e/build.wasm.spec.ts b/packages/cli/src/__tests__/e2e/build.wasm.spec.ts index 7d63cb3640..8f4d62cf53 100644 --- a/packages/cli/src/__tests__/e2e/build.wasm.spec.ts +++ b/packages/cli/src/__tests__/e2e/build.wasm.spec.ts @@ -192,7 +192,6 @@ describe("e2e tests for build command", () => { const logFileAbsPath = path.join(testCaseDir, logFilePath); const { exitCode: code } = await Commands.build({ logFile: logFilePath, - codegen: true }, { cwd: testCaseDir, cli: polywrapCli, @@ -209,7 +208,6 @@ describe("e2e tests for build command", () => { it("Builds for assemblyscript", async () => { const { exitCode: code, stdout: output } = await Commands.build({ strategy: "image", - codegen: true }, { cwd: getTestCaseDir(0), cli: polywrapCli, diff --git a/packages/cli/src/__tests__/e2e/create.spec.ts b/packages/cli/src/__tests__/e2e/create.spec.ts index 56a654ca6c..8f417c0f29 100644 --- a/packages/cli/src/__tests__/e2e/create.spec.ts +++ b/packages/cli/src/__tests__/e2e/create.spec.ts @@ -1,9 +1,11 @@ import { clearStyle, polywrapCli } from "./utils"; +import { ProjectType, supportedLangs } from "../../commands"; +import { UrlFormat } from "../../lib"; import { runCli } from "@polywrap/cli-js"; import rimraf from "rimraf"; -import { ProjectType, supportedLangs } from "../../commands"; -import { UrlFormat } from "../../lib"; +import path from "path"; +import fs from "fs"; const HELP = `Usage: polywrap create|c [options] [command] @@ -24,6 +26,14 @@ Commands: help [command] display help for command `; +const VERSION = + fs.readFileSync( + path.join(__dirname, "../../../../../VERSION"), + "utf-8" + ) + .replace(/\n/g, "") + .replace(/\r/g, ""); + const urlExamples = (format: UrlFormat): string => { if (format === UrlFormat.git) { return "https://github.com/polywrap/logging.git"; @@ -146,6 +156,10 @@ describe("e2e tests for create command", () => { config: { cwd: __dirname, cli: polywrapCli, + env: { + ...process.env, + OVERRIDE_CREATE_TEMPLATES_NPM: `@polywrap/templates@${VERSION}` + } } }); @@ -161,81 +175,91 @@ describe("e2e tests for create command", () => { }); } - describe("template", () => { - it("Should throw error for missing required argument - url", async () => { - const { exitCode: code, stdout: output, stderr: error } = await runCLI({ - args: ["create", "template"], + describe("template", () => { + it("Should throw error for missing required argument - url", async () => { + const { exitCode: code, stdout: output, stderr: error } = await runCli({ + args: ["create", "template"], + config: { cli: polywrapCli, - }); - - expect(code).toEqual(1); - expect(error).toContain("error: missing required argument 'url'"); - expect(output).toBe(""); + } }); - it("Should throw error for missing required argument - name", async () => { - const { exitCode: code, stdout: output, stderr: error } = await runCLI({ - args: ["create", "template", "lang"], - cli: polywrapCli, - }); + expect(code).toEqual(1); + expect(error).toContain("error: missing required argument 'url'"); + expect(output).toBe(""); + }); - expect(code).toEqual(1); - expect(error).toContain("error: missing required argument 'name'"); - expect(output).toBe(""); + it("Should throw error for missing required argument - name", async () => { + const { exitCode: code, stdout: output, stderr: error } = await runCli({ + args: ["create", "template", "lang"], + config: { + cli: polywrapCli, + } }); - it("Should throw error for invalid url parameter", async () => { - const { exitCode: code, stdout: output, stderr: error } = await runCLI({ - args: ["create", "template", "lang", "demo"], - cli: polywrapCli, - }); + expect(code).toEqual(1); + expect(error).toContain("error: missing required argument 'name'"); + expect(output).toBe(""); + }); - expect(code).toEqual(1); - expect(error).toContain(`URL 'lang' uses an invalid format. Valid URL formats: ${Object.values(UrlFormat).join(", ")}`); - expect(output).toBe(""); + it("Should throw error for invalid url parameter", async () => { + const { exitCode: code, stdout: output, stderr: error } = await runCli({ + args: ["create", "template", "lang", "demo"], + config: { + cli: polywrapCli, + } }); - for (const format of Object.values(UrlFormat)) { - const url = urlExamples(format); + expect(code).toEqual(1); + expect(error).toContain(`URL 'lang' uses an invalid format. Valid URL formats: ${Object.values(UrlFormat).join(", ")}`); + expect(output).toBe(""); + }); - describe(format, () => { - it("Should throw error for missing path argument for --output-dir option", async () => { - const { exitCode: code, stdout: output, stderr: error } = await runCLI({ - args: ["create", "template", url, "name", "-o"], - cli: polywrapCli, - }); + for (const format of Object.values(UrlFormat)) { + const url = urlExamples(format); - expect(code).toEqual(1); - expect(error).toContain( - "error: option '-o, --output-dir ' argument missing" - ); - expect(output).toBe(""); + describe(format, () => { + it("Should throw error for missing path argument for --output-dir option", async () => { + const { exitCode: code, stdout: output, stderr: error } = await runCli({ + args: ["create", "template", url, "name", "-o"], + config: { + cli: polywrapCli, + } }); - it("Should successfully generate project", async () => { - rimraf.sync(`${__dirname}/test`); + expect(code).toEqual(1); + expect(error).toContain( + "error: option '-o, --output-dir ' argument missing" + ); + expect(output).toBe(""); + }); - const { exitCode: code, stdout: output } = await runCLI({ - args: [ - "create", - "template", - url, - "test", - "-o", - `${__dirname}/test`, - ], + it("Should successfully generate project", async () => { + rimraf.sync(`${__dirname}/test`); + + const { exitCode: code, stdout: output } = await runCli({ + args: [ + "create", + "template", + url, + "test", + "-o", + `${__dirname}/test`, + ], + config: { cwd: __dirname, cli: polywrapCli, - }); + } + }); - expect(code).toEqual(0); - expect(clearStyle(output)).toContain( - "🔥 You are ready " - ); + expect(code).toEqual(0); + expect(clearStyle(output)).toContain( + "🔥 You are ready " + ); - rimraf.sync(`${__dirname}/test`); - }, 60000); - }) - } - }); + rimraf.sync(`${__dirname}/test`); + }, 60000); + }) + } + }); }); diff --git a/packages/cli/src/__tests__/e2e/deploy.spec.ts b/packages/cli/src/__tests__/e2e/deploy.spec.ts index 251ade1bf1..47f16e4d2c 100644 --- a/packages/cli/src/__tests__/e2e/deploy.spec.ts +++ b/packages/cli/src/__tests__/e2e/deploy.spec.ts @@ -38,7 +38,7 @@ const setup = async () => { modules: ["eth-ens-ipfs"], }) // Wait a little longer just in case - await new Promise((resolve) => setTimeout(resolve, 3000)); + await new Promise((resolve) => setTimeout(resolve, 10000)); // Setup environment variables process.env = { diff --git a/packages/cli/src/__tests__/e2e/test.spec.ts b/packages/cli/src/__tests__/e2e/test.spec.ts index 0beaa18232..09eb71e126 100644 --- a/packages/cli/src/__tests__/e2e/test.spec.ts +++ b/packages/cli/src/__tests__/e2e/test.spec.ts @@ -8,7 +8,7 @@ import { GetPathToCliTestFiles } from "@polywrap/test-cases"; import { Commands } from "@polywrap/cli-js"; import { TestCommandOptions } from "../../commands"; -jest.setTimeout(200000); +jest.setTimeout(100000); const HELP = `Usage: polywrap test|t [options] diff --git a/packages/cli/src/commands/build.ts b/packages/cli/src/commands/build.ts index f15e3984a1..216ea0f89c 100644 --- a/packages/cli/src/commands/build.ts +++ b/packages/cli/src/commands/build.ts @@ -98,24 +98,28 @@ export const build: Command = { `-l, --log-file [${pathStr}]`, `${intlMsg.commands_build_options_l()}` ) - .action(async (options: Partial) => { - await run({ - manifestFile: parseManifestFileOption( - options.manifestFile, - defaultPolywrapManifest - ), - clientConfig: options.clientConfig || false, - wrapperEnvs: options.wrapperEnvs || false, - outputDir: parseDirOption(options.outputDir, defaultOutputDir), - noCodegen: options.noCodegen || false, - codegenDir: parseDirOption(options.codegenDir, DEFAULT_CODEGEN_DIR), - strategy: options.strategy || defaultStrategy, - watch: options.watch || false, - verbose: options.verbose || false, - quiet: options.quiet || false, - logFile: parseLogFileOption(options.logFile), - }); - }); + .action( + async ( + options: Partial & { codegen: boolean } + ) => { + await run({ + manifestFile: parseManifestFileOption( + options.manifestFile, + defaultPolywrapManifest + ), + clientConfig: options.clientConfig || false, + wrapperEnvs: options.wrapperEnvs || false, + outputDir: parseDirOption(options.outputDir, defaultOutputDir), + noCodegen: !options.codegen || false, + codegenDir: parseDirOption(options.codegenDir, DEFAULT_CODEGEN_DIR), + strategy: options.strategy || defaultStrategy, + watch: options.watch || false, + verbose: options.verbose || false, + quiet: options.quiet || false, + logFile: parseLogFileOption(options.logFile), + }); + } + ); }, }; @@ -213,7 +217,7 @@ async function run(options: Required) { project as PolywrapProject ); - canRunCodegen = language != "interface"; + canRunCodegen = language !== "interface"; } const execute = async (): Promise => { diff --git a/packages/cli/src/lib/project/templates/generateProjectTemplate.ts b/packages/cli/src/lib/project/templates/generateProjectTemplate.ts index 438681dcee..826ebfe731 100644 --- a/packages/cli/src/lib/project/templates/generateProjectTemplate.ts +++ b/packages/cli/src/lib/project/templates/generateProjectTemplate.ts @@ -93,7 +93,8 @@ export const generateProjectTemplate = async ( const isOnline = checkIfOnline(useYarn); const root = path.resolve(projectDir); - const dependencies: string[] = ["@polywrap/templates"]; + const packageNameOverride = process.env.OVERRIDE_CREATE_TEMPLATES_NPM; + const dependencies: string[] = [packageNameOverride || "@polywrap/templates"]; fs.writeFileSync( path.join(root, "package.json"), diff --git a/packages/interfaces/uri-resolver/package.json b/packages/interfaces/uri-resolver/package.json index 990e20ca44..f0cc63be3f 100644 --- a/packages/interfaces/uri-resolver/package.json +++ b/packages/interfaces/uri-resolver/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/uri-resolver-interface", "description": "URI Resolver Interface", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "scripts": { "build": "node ../../../dependencies/node_modules/polywrap/bin/polywrap build", "lint": "eslint --color -c ../../../.eslintrc.js .", @@ -10,7 +10,7 @@ "deploy": "npx polywrap deploy" }, "devDependencies": { - "polywrap": "0.10.0-pre.11" + "polywrap": "0.10.0-pre.12" }, "publishConfig": { "access": "public" diff --git a/packages/js/asyncify/package.json b/packages/js/asyncify/package.json index 88d9ab8bfe..16df0c1f06 100644 --- a/packages/js/asyncify/package.json +++ b/packages/js/asyncify/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/asyncify-js", "description": "Async Wasm Imports Support Using Asyncify", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", diff --git a/packages/js/cli/package.json b/packages/js/cli/package.json index 0da072046d..41f82e86ea 100644 --- a/packages/js/cli/package.json +++ b/packages/js/cli/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/cli-js", "description": "Programmatically execute the Polywrap CLI", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -18,7 +18,7 @@ "test:ci": "jest --passWithNoTests --runInBand --detectOpenHandles --verbose" }, "dependencies": { - "polywrap": "0.10.0-pre.11", + "polywrap": "0.10.0-pre.12", "spawn-command": "0.0.2-1" }, "devDependencies": { diff --git a/packages/js/client-config-builder/package.json b/packages/js/client-config-builder/package.json index d7fd1b83b3..1e4e9a0f78 100644 --- a/packages/js/client-config-builder/package.json +++ b/packages/js/client-config-builder/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/client-config-builder-js", "description": "Polywrap Javascript Client configuration", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -24,15 +24,15 @@ }, "dependencies": { "@polywrap/concurrent-plugin-js": "~0.10.0-pre", - "@polywrap/core-js": "0.10.0-pre.11", + "@polywrap/core-js": "0.10.0-pre.12", "@polywrap/ethereum-provider-js": "~0.2.3", "@polywrap/file-system-plugin-js": "~0.10.0-pre", "@polywrap/http-plugin-js": "~0.10.0-pre", "@polywrap/logger-plugin-js": "0.10.0-pre.10", - "@polywrap/plugin-js": "0.10.0-pre.11", - "@polywrap/uri-resolver-extensions-js": "0.10.0-pre.11", - "@polywrap/uri-resolvers-js": "0.10.0-pre.11", - "@polywrap/wasm-js": "0.10.0-pre.11", + "@polywrap/plugin-js": "0.10.0-pre.12", + "@polywrap/uri-resolver-extensions-js": "0.10.0-pre.12", + "@polywrap/uri-resolvers-js": "0.10.0-pre.12", + "@polywrap/wasm-js": "0.10.0-pre.12", "base64-to-uint8array": "1.0.0" }, "devDependencies": { diff --git a/packages/js/client/package.json b/packages/js/client/package.json index 861dce8870..1b954fc7c0 100644 --- a/packages/js/client/package.json +++ b/packages/js/client/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/client-js", "description": "Polywrap Javascript Client", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -23,27 +23,27 @@ "build:readme": "yarn doc-snippets combine" }, "dependencies": { - "@polywrap/client-config-builder-js": "0.10.0-pre.11", - "@polywrap/core-client-js": "0.10.0-pre.11", - "@polywrap/core-js": "0.10.0-pre.11", - "@polywrap/msgpack-js": "0.10.0-pre.11", - "@polywrap/plugin-js": "0.10.0-pre.11", - "@polywrap/result": "0.10.0-pre.11", - "@polywrap/tracing-js": "0.10.0-pre.11", - "@polywrap/uri-resolver-extensions-js": "0.10.0-pre.11", - "@polywrap/uri-resolvers-js": "0.10.0-pre.11", - "@polywrap/wrap-manifest-types-js": "0.10.0-pre.11" + "@polywrap/client-config-builder-js": "0.10.0-pre.12", + "@polywrap/core-client-js": "0.10.0-pre.12", + "@polywrap/core-js": "0.10.0-pre.12", + "@polywrap/msgpack-js": "0.10.0-pre.12", + "@polywrap/plugin-js": "0.10.0-pre.12", + "@polywrap/result": "0.10.0-pre.12", + "@polywrap/tracing-js": "0.10.0-pre.12", + "@polywrap/uri-resolver-extensions-js": "0.10.0-pre.12", + "@polywrap/uri-resolvers-js": "0.10.0-pre.12", + "@polywrap/wrap-manifest-types-js": "0.10.0-pre.12" }, "devDependencies": { - "@polywrap/test-cases": "0.10.0-pre.11", - "@polywrap/cli-js": "0.10.0-pre.11", + "@polywrap/cli-js": "0.10.0-pre.12", + "@polywrap/test-cases": "0.10.0-pre.12", "@types/jest": "26.0.8", "@types/prettier": "2.6.0", "@types/uuid": "8.3.0", "bignumber.js": "9.0.2", "doc-snippets": "~1.0.0", "jest": "26.6.3", - "polywrap": "0.10.0-pre.11", + "polywrap": "0.10.0-pre.12", "rimraf": "3.0.2", "ts-jest": "26.5.4", "ts-loader": "8.0.17", diff --git a/packages/js/client/src/__tests__/core/error-structure.spec.ts b/packages/js/client/src/__tests__/core/error-structure.spec.ts index c6f599a812..a22acf7ab7 100644 --- a/packages/js/client/src/__tests__/core/error-structure.spec.ts +++ b/packages/js/client/src/__tests__/core/error-structure.spec.ts @@ -84,11 +84,9 @@ describe("Error structure", () => { ).toBeTruthy(); expect(result.error?.method).toEqual("throwError"); expect(result.error?.args).toEqual('{\n "a": "Hey"\n}'); - expect(result.error?.source).toEqual({ - file: "~lib/@polywrap/wasm-as/containers/Result.ts", - row: 171, - col: 13, - }); + expect(result.error?.source?.file).toEqual( + "~lib/@polywrap/wasm-as/containers/Result.ts" + ); expect(result.error?.innerError instanceof WrapError).toBeTruthy(); const prev = result.error?.innerError as WrapError; @@ -128,11 +126,9 @@ describe("Error structure", () => { ).toBeTruthy(); expect(result.error?.method).toEqual("add"); expect(result.error?.args).toEqual('{\n "a": "1",\n "b": 1\n}'); - expect(result.error?.source).toEqual({ - file: "~lib/@polywrap/wasm-as/msgpack/ReadDecoder.ts", - row: 547, - col: 9, - }); + expect(result.error?.source?.file).toEqual( + "~lib/@polywrap/wasm-as/msgpack/ReadDecoder.ts" + ); }); test("Invoke a wrapper method that doesn't exist", async () => { @@ -216,11 +212,9 @@ describe("Error structure", () => { expect(prev.uri).toEqual("wrap://ens/imported-invoke.eth"); expect(prev.method).toEqual("invokeThrowError"); expect(prev.args).toEqual('{\n "a": "Hey"\n}' ); - expect(prev.source).toEqual({ - file: "~lib/@polywrap/wasm-as/containers/Result.ts", - row: 171, - col: 13, - }); + expect(prev.source?.file).toEqual( + "~lib/@polywrap/wasm-as/containers/Result.ts" + ); expect(prev.innerError instanceof WrapError).toBeTruthy(); const prevOfPrev = prev.innerError as WrapError; @@ -232,11 +226,9 @@ describe("Error structure", () => { ).toBeTruthy(); expect(prevOfPrev.method).toEqual("subinvokeThrowError"); expect(prev.args).toEqual('{\n "a": "Hey"\n}'); - expect(prevOfPrev.source).toEqual({ - file: "src/index.ts", - row: 8, - col: 5, - }); + expect(prevOfPrev.source?.file).toEqual( + "src/index.ts" + ); }); describe("Incompatible version invocation", () => { @@ -333,11 +325,9 @@ describe("Error structure", () => { ).toBeTruthy(); expect(result.error?.method).toEqual("add"); expect(result.error?.args).toEqual('{\n "a": "1",\n "b": 1\n}'); - expect(result.error?.source).toEqual({ - file: "src/wrap/module/wrapped.rs", - row: 27, - col: 13, - }); + expect(result.error?.source?.file).toEqual( + "src/wrap/module/wrapped.rs" + ); }); test("Invoke a wrapper method that doesn't exist", async () => { @@ -419,7 +409,7 @@ describe("Error structure", () => { expect(prev.uri).toEqual("wrap://ens/imported-invoke.eth"); expect(prev.method).toEqual("invokeThrowError"); expect(prev.args).toEqual('{\n "a": "Hey"\n}'); - expect(prev.source).toEqual({ file: "src/lib.rs", row: 10, col: 129 }); + expect(prev.source?.file).toEqual("src/lib.rs"); expect(prev.innerError instanceof WrapError).toBeTruthy(); const prevOfPrev = prev.innerError as WrapError; @@ -431,11 +421,9 @@ describe("Error structure", () => { ).toBeTruthy(); expect(prevOfPrev.method).toEqual("subinvokeThrowError"); expect(prevOfPrev.args).toEqual('{\n "a": "Hey"\n}'); - expect(prevOfPrev.source).toEqual({ - file: "src/lib.rs", - row: 9, - col: 5, - }); + expect(prevOfPrev.source?.file).toEqual( + "src/lib.rs" + ); }); }); @@ -468,11 +456,9 @@ describe("Error structure", () => { expect(result.error?.args).toContain( '{\n "pathh": "packages/js/client/src/__tests__/core/index.ts"\n}' ); - expect(result.error?.source).toEqual({ - file: "node:internal/fs/promises", - row: 503, - col: 10, - }); + expect(result.error?.source?.file).toEqual( + "node:internal/fs/promises" + ); }); test("Invoke a plugin wrapper with a method that doesn't exist", async () => { diff --git a/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve a URI resolver extension wrapper.json b/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve a URI resolver extension wrapper.json index 859bcf2b40..cb2eca7980 100644 --- a/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve a URI resolver extension wrapper.json +++ b/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve a URI resolver extension wrapper.json @@ -54,13 +54,13 @@ ] ] ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ @@ -70,24 +70,24 @@ [ "wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0)" ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => UriResolverAggregator => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => UriResolverAggregator => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ExtendableUriResolver => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ExtendableUriResolver => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)" ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] diff --git a/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve cache - 1.json b/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve cache - 1.json index 0cf4f0c94e..43712d2027 100644 --- a/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve cache - 1.json +++ b/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve cache - 1.json @@ -54,13 +54,13 @@ ] ] ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ @@ -70,24 +70,24 @@ [ "wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0)" ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => UriResolverAggregator => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => UriResolverAggregator => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ExtendableUriResolver => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ExtendableUriResolver => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)" ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] diff --git a/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve previously cached URI after redirecting by a URI resolver extension - 1.json b/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve previously cached URI after redirecting by a URI resolver extension - 1.json index 859bcf2b40..cb2eca7980 100644 --- a/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve previously cached URI after redirecting by a URI resolver extension - 1.json +++ b/packages/js/client/src/__tests__/core/uri-resolution/histories/can resolve previously cached URI after redirecting by a URI resolver extension - 1.json @@ -54,13 +54,13 @@ ] ] ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ @@ -70,24 +70,24 @@ [ "wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0)" ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => UriResolverAggregator => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => UriResolverAggregator => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ExtendableUriResolver => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ExtendableUriResolver => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)" ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] diff --git a/packages/js/client/src/__tests__/core/uri-resolution/histories/custom wrapper resolver does not cause infinite recursion when resolved at runtime.json b/packages/js/client/src/__tests__/core/uri-resolution/histories/custom wrapper resolver does not cause infinite recursion when resolved at runtime.json index a138c3adf0..333992f9e6 100644 --- a/packages/js/client/src/__tests__/core/uri-resolution/histories/custom wrapper resolver does not cause infinite recursion when resolved at runtime.json +++ b/packages/js/client/src/__tests__/core/uri-resolution/histories/custom wrapper resolver does not cause infinite recursion when resolved at runtime.json @@ -54,13 +54,13 @@ ] ] ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ @@ -70,24 +70,24 @@ [ "wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0)" ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => UriResolverAggregator => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => UriResolverAggregator => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ExtendableUriResolver => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ExtendableUriResolver => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)" ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] diff --git a/packages/js/client/src/__tests__/core/uri-resolution/histories/restarts URI resolution after URI resolver extension redirect.json b/packages/js/client/src/__tests__/core/uri-resolution/histories/restarts URI resolution after URI resolver extension redirect.json index 2db2c74572..9303fb2a77 100644 --- a/packages/js/client/src/__tests__/core/uri-resolution/histories/restarts URI resolution after URI resolver extension redirect.json +++ b/packages/js/client/src/__tests__/core/uri-resolution/histories/restarts URI resolution after URI resolver extension redirect.json @@ -54,13 +54,13 @@ ] ] ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ @@ -70,24 +70,24 @@ [ "wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0)" ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => UriResolverAggregator => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => UriResolverAggregator => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ExtendableUriResolver => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ExtendableUriResolver => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)" ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] diff --git a/packages/js/client/src/__tests__/core/uri-resolution/histories/sanity.json b/packages/js/client/src/__tests__/core/uri-resolution/histories/sanity.json index 7b5fb2905e..2666cde70d 100644 --- a/packages/js/client/src/__tests__/core/uri-resolution/histories/sanity.json +++ b/packages/js/client/src/__tests__/core/uri-resolution/histories/sanity.json @@ -58,14 +58,14 @@ ] ], "wrap://ens/uri.eth => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0)", - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => UriResolverAggregator => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => StaticResolver - Miss", - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ExtendableUriResolver => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ @@ -76,25 +76,25 @@ [ "wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0)" ], - "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ens/wraps.eth:http-uri-resolver-ext@1.0.0 => ResolverExtension (wrap://ens/wraps.eth:ens-text-record-uri-resolver-ext@1.0.0) => uri (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => RequestSynchronizerResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => PackageToWrapperCacheResolver => wrapper (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => UriResolverAggregator => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => UriResolverAggregator => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => StaticResolver - Miss", - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ExtendableUriResolver => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => StaticResolver - Miss", + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ExtendableUriResolver => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => RequestSynchronizerResolver => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)", [ "wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0 => PackageToWrapperCacheResolver (Cache) => wrapper (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0)" ], - "wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmRmvC9y481GJ6arGsPqLvU7H8Zy86P8US9onmE48VpKop)" + "wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg => ResolverExtension (wrap://ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.0) => package (wrap://ipfs/QmbsxmNDbJ3uNp9CRBTfTVQJikCYWQrFcXbC3mVpTRTLZg)" ] ] ] diff --git a/packages/js/core-client/package.json b/packages/js/core-client/package.json index 9f9b37e538..051efd04dd 100644 --- a/packages/js/core-client/package.json +++ b/packages/js/core-client/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/core-client-js", "description": "Polywrap Javascript Core Client", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -21,14 +21,14 @@ "build:readme": "yarn doc-snippets combine" }, "dependencies": { - "@polywrap/core-js": "0.10.0-pre.11", - "@polywrap/msgpack-js": "0.10.0-pre.11", - "@polywrap/result": "0.10.0-pre.11", - "@polywrap/tracing-js": "0.10.0-pre.11", - "@polywrap/wrap-manifest-types-js": "0.10.0-pre.11" + "@polywrap/core-js": "0.10.0-pre.12", + "@polywrap/msgpack-js": "0.10.0-pre.12", + "@polywrap/result": "0.10.0-pre.12", + "@polywrap/tracing-js": "0.10.0-pre.12", + "@polywrap/wrap-manifest-types-js": "0.10.0-pre.12" }, "devDependencies": { - "@polywrap/uri-resolvers-js": "0.10.0-pre.11", + "@polywrap/uri-resolvers-js": "0.10.0-pre.12", "@types/jest": "26.0.8", "@types/uuid": "8.3.0", "doc-snippets": "~1.0.0", diff --git a/packages/js/core/package.json b/packages/js/core/package.json index 05f7efbef8..21bc1e5009 100644 --- a/packages/js/core/package.json +++ b/packages/js/core/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/core-js", "description": "Polywrap Javascript Core", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -23,9 +23,9 @@ "build:readme": "yarn build:readme:subsections && yarn build:readme:final" }, "dependencies": { - "@polywrap/result": "0.10.0-pre.11", - "@polywrap/tracing-js": "0.10.0-pre.11", - "@polywrap/wrap-manifest-types-js": "0.10.0-pre.11" + "@polywrap/result": "0.10.0-pre.12", + "@polywrap/tracing-js": "0.10.0-pre.12", + "@polywrap/wrap-manifest-types-js": "0.10.0-pre.12" }, "devDependencies": { "@types/jest": "26.0.8", diff --git a/packages/js/core/src/types/WrapError.ts b/packages/js/core/src/types/WrapError.ts index f2bae3bea8..38641858b1 100644 --- a/packages/js/core/src/types/WrapError.ts +++ b/packages/js/core/src/types/WrapError.ts @@ -141,11 +141,15 @@ export class WrapError extends Error { return `${this.name}: ${this.message}`; } + toJSON(): string { + return this.toString(); + } + // remove escape characters that may have been added by Rust private static sanitizeUnwrappedRustResult(error: string): string { if ( error.startsWith( - '__wrap_abort: called `Result::unwrap()` on an `Err` value: "' + "__wrap_abort: called `Result::unwrap()` on an `Err` value: " ) ) { error = error.replace(/\\"/g, '"'); diff --git a/packages/js/logging/package.json b/packages/js/logging/package.json index c86faa6383..c51bc8e959 100644 --- a/packages/js/logging/package.json +++ b/packages/js/logging/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/logging-js", "description": "Polywrap Core Logging Interface", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", diff --git a/packages/js/manifests/polywrap/package.json b/packages/js/manifests/polywrap/package.json index d0eacbb9c1..dca7cf73f9 100644 --- a/packages/js/manifests/polywrap/package.json +++ b/packages/js/manifests/polywrap/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/polywrap-manifest-types-js", "description": "Polywrap Manifest TypeScript Typings", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -16,14 +16,14 @@ "test:watch": "jest --watch --passWithNoTests --verbose" }, "dependencies": { - "@polywrap/logging-js": "0.10.0-pre.11", - "@polywrap/polywrap-manifest-schemas": "0.10.0-pre.11", + "@polywrap/logging-js": "0.10.0-pre.12", + "@polywrap/polywrap-manifest-schemas": "0.10.0-pre.12", "jsonschema": "1.4.0", "semver": "7.3.8", "yaml": "2.1.3" }, "devDependencies": { - "@polywrap/os-js": "0.10.0-pre.11", + "@polywrap/os-js": "0.10.0-pre.12", "@types/jest": "26.0.8", "@types/mustache": "4.0.1", "@types/prettier": "2.6.0", diff --git a/packages/js/manifests/wrap/package.json b/packages/js/manifests/wrap/package.json index e231c753ba..a970619434 100644 --- a/packages/js/manifests/wrap/package.json +++ b/packages/js/manifests/wrap/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/wrap-manifest-types-js", "description": "WRAP Manifest TypeScript Typings", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -21,8 +21,8 @@ "semver": "7.3.8" }, "devDependencies": { - "@polywrap/msgpack-js": "0.10.0-pre.11", - "@polywrap/os-js": "0.10.0-pre.11", + "@polywrap/msgpack-js": "0.10.0-pre.12", + "@polywrap/os-js": "0.10.0-pre.12", "@polywrap/wrap-manifest-schemas": "0.9.3", "@types/jest": "26.0.8", "@types/mustache": "4.0.1", diff --git a/packages/js/msgpack/package.json b/packages/js/msgpack/package.json index ac5b5e6a00..945874fd2d 100644 --- a/packages/js/msgpack/package.json +++ b/packages/js/msgpack/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/msgpack-js", "description": "WRAP MsgPack Encoding", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", diff --git a/packages/js/os/package.json b/packages/js/os/package.json index 4672e17c17..021393b7f1 100644 --- a/packages/js/os/package.json +++ b/packages/js/os/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/os-js", "description": "Polywrap Javascript OS Utilities", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", diff --git a/packages/js/plugin/package.json b/packages/js/plugin/package.json index 343fe30063..c7364b466d 100644 --- a/packages/js/plugin/package.json +++ b/packages/js/plugin/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/plugin-js", "description": "Polywrap plugin core package for plugin wrappers", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -19,11 +19,11 @@ "test:watch": "jest --watch --passWithNoTests --verbose" }, "dependencies": { - "@polywrap/core-js": "0.10.0-pre.11", - "@polywrap/msgpack-js": "0.10.0-pre.11", - "@polywrap/result": "0.10.0-pre.11", - "@polywrap/tracing-js": "0.10.0-pre.11", - "@polywrap/wrap-manifest-types-js": "0.10.0-pre.11" + "@polywrap/core-js": "0.10.0-pre.12", + "@polywrap/msgpack-js": "0.10.0-pre.12", + "@polywrap/result": "0.10.0-pre.12", + "@polywrap/tracing-js": "0.10.0-pre.12", + "@polywrap/wrap-manifest-types-js": "0.10.0-pre.12" }, "devDependencies": { "@types/jest": "26.0.8", diff --git a/packages/js/result/package.json b/packages/js/result/package.json index 84d2c49e57..97fb5f0cd7 100644 --- a/packages/js/result/package.json +++ b/packages/js/result/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/result", "description": "Result helpers", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", diff --git a/packages/js/tracing/package.json b/packages/js/tracing/package.json index befe013e57..994f9feb82 100644 --- a/packages/js/tracing/package.json +++ b/packages/js/tracing/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/tracing-js", "description": "Polywrap Core Tracing", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", diff --git a/packages/js/uri-resolver-extensions/package.json b/packages/js/uri-resolver-extensions/package.json index 7372eded25..2fd6092842 100644 --- a/packages/js/uri-resolver-extensions/package.json +++ b/packages/js/uri-resolver-extensions/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/uri-resolver-extensions-js", "description": "Polywrap URI resolver extensions", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -22,11 +22,11 @@ "build:readme": "yarn doc-snippets combine" }, "dependencies": { - "@polywrap/core-js": "0.10.0-pre.11", - "@polywrap/result": "0.10.0-pre.11", - "@polywrap/uri-resolvers-js": "0.10.0-pre.11", - "@polywrap/wasm-js": "0.10.0-pre.11", - "@polywrap/wrap-manifest-types-js": "0.10.0-pre.11" + "@polywrap/core-js": "0.10.0-pre.12", + "@polywrap/result": "0.10.0-pre.12", + "@polywrap/uri-resolvers-js": "0.10.0-pre.12", + "@polywrap/wasm-js": "0.10.0-pre.12", + "@polywrap/wrap-manifest-types-js": "0.10.0-pre.12" }, "devDependencies": { "@types/jest": "26.0.8", diff --git a/packages/js/uri-resolvers/package.json b/packages/js/uri-resolvers/package.json index ea4113a479..c6c66f4f5d 100644 --- a/packages/js/uri-resolvers/package.json +++ b/packages/js/uri-resolvers/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/uri-resolvers-js", "description": "Polywrap URI resolvers", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -24,9 +24,9 @@ "build:readme": "yarn build:readme:subsections && yarn build:readme:final" }, "dependencies": { - "@polywrap/core-js": "0.10.0-pre.11", - "@polywrap/result": "0.10.0-pre.11", - "@polywrap/wrap-manifest-types-js": "0.10.0-pre.11" + "@polywrap/core-js": "0.10.0-pre.12", + "@polywrap/result": "0.10.0-pre.12", + "@polywrap/wrap-manifest-types-js": "0.10.0-pre.12" }, "devDependencies": { "@types/jest": "26.0.8", diff --git a/packages/js/validation/package.json b/packages/js/validation/package.json index b888295ead..487df077e0 100644 --- a/packages/js/validation/package.json +++ b/packages/js/validation/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/package-validation", "description": "Polywrap Package Validator", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -19,12 +19,12 @@ "test:watch": "jest --watch --passWithNoTests --verbose" }, "dependencies": { - "@polywrap/schema-compose": "0.10.0-pre.11", - "@polywrap/wrap-manifest-types-js": "0.10.0-pre.11" + "@polywrap/schema-compose": "0.10.0-pre.12", + "@polywrap/wrap-manifest-types-js": "0.10.0-pre.12" }, "devDependencies": { - "@polywrap/msgpack-js": "0.10.0-pre.11", - "@polywrap/os-js": "0.10.0-pre.11", + "@polywrap/msgpack-js": "0.10.0-pre.12", + "@polywrap/os-js": "0.10.0-pre.12", "@types/jest": "26.0.8", "jest": "26.6.3", "rimraf": "3.0.2", diff --git a/packages/js/wasm/package.json b/packages/js/wasm/package.json index 0156a189d9..34a554daa0 100644 --- a/packages/js/wasm/package.json +++ b/packages/js/wasm/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/wasm-js", "description": "Polywrap WASM wrappers", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -19,15 +19,15 @@ "test:watch": "jest --watch --passWithNoTests --verbose" }, "dependencies": { - "@polywrap/asyncify-js": "0.10.0-pre.11", - "@polywrap/core-js": "0.10.0-pre.11", - "@polywrap/msgpack-js": "0.10.0-pre.11", - "@polywrap/result": "0.10.0-pre.11", - "@polywrap/tracing-js": "0.10.0-pre.11", - "@polywrap/wrap-manifest-types-js": "0.10.0-pre.11" + "@polywrap/asyncify-js": "0.10.0-pre.12", + "@polywrap/core-js": "0.10.0-pre.12", + "@polywrap/msgpack-js": "0.10.0-pre.12", + "@polywrap/result": "0.10.0-pre.12", + "@polywrap/tracing-js": "0.10.0-pre.12", + "@polywrap/wrap-manifest-types-js": "0.10.0-pre.12" }, "devDependencies": { - "@polywrap/cli-js": "0.10.0-pre.11", + "@polywrap/cli-js": "0.10.0-pre.12", "@types/jest": "26.0.8", "jest": "26.6.3", "rimraf": "3.0.2", diff --git a/packages/manifests/polywrap/package.json b/packages/manifests/polywrap/package.json index 67ce9a120b..f29adca550 100644 --- a/packages/manifests/polywrap/package.json +++ b/packages/manifests/polywrap/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/polywrap-manifest-schemas", "description": "Polywrap Manifest Schemas", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", diff --git a/packages/schema/bind/package.json b/packages/schema/bind/package.json index 0d2486020d..0a2035750d 100644 --- a/packages/schema/bind/package.json +++ b/packages/schema/bind/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/schema-bind", "description": "Polywrap Schema Binding", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -20,13 +20,13 @@ "copy:templates": "copyfiles -u 1 src/**/*.mustache build/" }, "dependencies": { - "@polywrap/os-js": "0.10.0-pre.11", - "@polywrap/schema-parse": "0.10.0-pre.11", - "@polywrap/wrap-manifest-types-js": "0.10.0-pre.11", + "@polywrap/os-js": "0.10.0-pre.12", + "@polywrap/schema-parse": "0.10.0-pre.12", + "@polywrap/wrap-manifest-types-js": "0.10.0-pre.12", "mustache": "4.0.1" }, "devDependencies": { - "@polywrap/test-cases": "0.10.0-pre.11", + "@polywrap/test-cases": "0.10.0-pre.12", "@types/jest": "26.0.8", "@types/lodash": "4.14.178", "@types/mustache": "4.0.1", diff --git a/packages/schema/compose/package.json b/packages/schema/compose/package.json index 07433212aa..bf909516d9 100644 --- a/packages/schema/compose/package.json +++ b/packages/schema/compose/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/schema-compose", "description": "Polywrap Schema Composition", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -19,14 +19,14 @@ "test:watch": "jest --watch --passWithNoTests --verbose" }, "dependencies": { - "@polywrap/schema-parse": "0.10.0-pre.11", - "@polywrap/wrap-manifest-types-js": "0.10.0-pre.11", + "@polywrap/schema-parse": "0.10.0-pre.12", + "@polywrap/wrap-manifest-types-js": "0.10.0-pre.12", "graphql": "15.5.0", "mustache": "4.0.1" }, "devDependencies": { - "@polywrap/test-cases": "0.10.0-pre.11", - "@polywrap/os-js": "0.10.0-pre.11", + "@polywrap/os-js": "0.10.0-pre.12", + "@polywrap/test-cases": "0.10.0-pre.12", "@types/jest": "26.0.8", "@types/mustache": "4.0.1", "@types/prettier": "2.6.0", diff --git a/packages/schema/parse/package.json b/packages/schema/parse/package.json index 877c139233..b2c7860d78 100644 --- a/packages/schema/parse/package.json +++ b/packages/schema/parse/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/schema-parse", "description": "Polywrap Schema Parsing", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", @@ -20,11 +20,11 @@ }, "dependencies": { "@dorgjelli/graphql-schema-cycles": "1.1.4", - "@polywrap/wrap-manifest-types-js": "0.10.0-pre.11", + "@polywrap/wrap-manifest-types-js": "0.10.0-pre.12", "graphql": "15.5.0" }, "devDependencies": { - "@polywrap/test-cases": "0.10.0-pre.11", + "@polywrap/test-cases": "0.10.0-pre.12", "@types/deep-equal": "1.0.1", "@types/jest": "26.0.8", "@types/prettier": "2.6.0", diff --git a/packages/templates/app/typescript/package.json b/packages/templates/app/typescript/package.json index 7cc43c2dc2..90ea3d7707 100644 --- a/packages/templates/app/typescript/package.json +++ b/packages/templates/app/typescript/package.json @@ -2,17 +2,17 @@ "name": "templates-app-typescript", "description": "Polywrap App TypeScript Template", "private": true, - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "scripts": { "build": "npx polywrap codegen", "test": "ts-node ./src/index.ts" }, "dependencies": { - "@polywrap/client-js": "0.10.0-pre.11" + "@polywrap/client-js": "0.10.0-pre.12" }, "devDependencies": { "@types/node": "^18.14.6", - "polywrap": "0.10.0-pre.11", + "polywrap": "0.10.0-pre.12", "ts-node": "10.9.1", "typescript": "4.9.5" } diff --git a/packages/templates/package.json b/packages/templates/package.json index 58ae130187..17bc2be045 100644 --- a/packages/templates/package.json +++ b/packages/templates/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/templates", "description": "Polywrap Templates", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", diff --git a/packages/templates/plugin/typescript/package.json b/packages/templates/plugin/typescript/package.json index 15ad6857f5..a4b2388374 100644 --- a/packages/templates/plugin/typescript/package.json +++ b/packages/templates/plugin/typescript/package.json @@ -2,7 +2,7 @@ "name": "templates-plugin-typescript", "description": "Polywrap Plugin Typescript Template", "private": true, - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "main": "build/index.js", "scripts": { "build": "rimraf ./build && yarn codegen && tsc --project tsconfig.json", @@ -12,19 +12,19 @@ "test:watch": "jest --watch --passWithNoTests --verbose" }, "dependencies": { - "@polywrap/core-js": "0.10.0-pre.11", - "@polywrap/plugin-js": "0.10.0-pre.11" + "@polywrap/core-js": "0.10.0-pre.12", + "@polywrap/plugin-js": "0.10.0-pre.12" }, "peerDependencies": { "@polywrap/core-js": "0.10.x", "@polywrap/plugin-js": "0.10.x" }, "devDependencies": { - "@polywrap/client-js": "0.10.0-pre.11", + "@polywrap/client-js": "0.10.0-pre.12", "@types/jest": "26.0.8", "@types/prettier": "2.6.0", "jest": "26.6.3", - "polywrap": "0.10.0-pre.11", + "polywrap": "0.10.0-pre.12", "rimraf": "3.0.2", "ts-jest": "26.5.4", "ts-node": "10.9.1", diff --git a/packages/templates/wasm/assemblyscript/package.json b/packages/templates/wasm/assemblyscript/package.json index 309dd9231d..c7ad8270b2 100644 --- a/packages/templates/wasm/assemblyscript/package.json +++ b/packages/templates/wasm/assemblyscript/package.json @@ -2,7 +2,7 @@ "name": "template-wasm-as", "description": "Polywrap AssemblyScript Wrapper Template", "private": true, - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "scripts": { "codegen": "npx polywrap codegen", "build": "npx polywrap build", @@ -17,12 +17,12 @@ "devDependencies": { "@types/jest": "26.0.8", "jest": "26.6.3", - "polywrap": "0.10.0-pre.11", + "polywrap": "0.10.0-pre.12", "ts-jest": "26.5.4", "typescript": "4.9.5" }, "dependencies": { - "@polywrap/wasm-as": "0.10.0-pre.11", + "@polywrap/wasm-as": "0.10.0-pre.12", "assemblyscript": "0.19.23" } } diff --git a/packages/templates/wasm/interface/package.json b/packages/templates/wasm/interface/package.json index e09f0cef74..cab8ea29d9 100644 --- a/packages/templates/wasm/interface/package.json +++ b/packages/templates/wasm/interface/package.json @@ -2,7 +2,7 @@ "name": "templates-wrapper-interface", "description": "Polywrap Interface Example", "private": true, - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "scripts": { "build": "npx polywrap build", "test:env:up": "npx polywrap infra up --modules=eth-ens-ipfs", @@ -11,6 +11,6 @@ "test": "yarn test:env:up && yarn deploy && yarn test:env:down" }, "devDependencies": { - "polywrap": "0.10.0-pre.11" + "polywrap": "0.10.0-pre.12" } } diff --git a/packages/templates/wasm/rust/package.json b/packages/templates/wasm/rust/package.json index 5e9d8a5920..127b1ea64d 100644 --- a/packages/templates/wasm/rust/package.json +++ b/packages/templates/wasm/rust/package.json @@ -2,7 +2,7 @@ "name": "template-wasm-rs", "description": "Polywrap Rust Wrapper Template", "private": true, - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "scripts": { "codegen": "npx polywrap codegen", "build": "npx polywrap build", @@ -17,7 +17,7 @@ "devDependencies": { "@types/jest": "26.0.8", "jest": "26.6.3", - "polywrap": "0.10.0-pre.11", + "polywrap": "0.10.0-pre.12", "ts-jest": "26.5.4", "typescript": "4.9.5" } diff --git a/packages/test-cases/package.json b/packages/test-cases/package.json index 43683f8c32..1a0217e633 100644 --- a/packages/test-cases/package.json +++ b/packages/test-cases/package.json @@ -2,14 +2,14 @@ "name": "@polywrap/test-cases", "description": "Reusable Polywrap Test Cases", "private": true, - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "main": "index.ts", "scripts": { "generate:wrappers": "ts-node -e \"import { fetchWrappers } from './'; (async () => await fetchWrappers())()\"" }, "dependencies": { - "@polywrap/os-js": "0.10.0-pre.11" + "@polywrap/os-js": "0.10.0-pre.12" }, "devDependencies": { "@types/adm-zip": "0.5.0", diff --git a/packages/wasm/as/package.json b/packages/wasm/as/package.json index 73eda64a2a..5a573f5a72 100644 --- a/packages/wasm/as/package.json +++ b/packages/wasm/as/package.json @@ -1,7 +1,7 @@ { "name": "@polywrap/wasm-as", "description": "Polywrap Assemblyscript Runtime", - "version": "0.10.0-pre.11", + "version": "0.10.0-pre.12", "license": "MIT", "repository": { "type": "git", diff --git a/packages/wasm/rs/Cargo.toml b/packages/wasm/rs/Cargo.toml index 86a7c65352..0a7f03c1cf 100644 --- a/packages/wasm/rs/Cargo.toml +++ b/packages/wasm/rs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polywrap-wasm-rs" -version = "0.10.0-pre.11" +version = "0.10.0-pre.12" license = "MIT" description = "Polywrap's Rust-Wasm Runtime" homepage = "https://polywrap.io"