Merge pull request #978 from polywrap/prealpha-dev

Prep 0.0.1-prealpha.90

Author: dOrgJelli

.eslintrc.js

@@ -40,7 +40,7 @@ module.exports = {
             ],
             format: ["camelCase"], leadingUnderscore: "allow"
           },
-          //wrap host methods doesn"t satisfy neither camel or snake
+          //wrap host methods doesn't satisfy neither camel or snake
           {selector: ["objectLiteralMethod", "typeMethod"], filter: {regex: "^_wrap_.*", match: true}, format: null},
           //variable must be in camel or upper case
           {selector: "variable", format: ["camelCase", "UPPER_CASE"], leadingUnderscore: "allow"},

CHANGELOG.md

@@ -1,3 +1,20 @@
+# Polywrap 0.0.1-prealpha.90
+## Features
+* [PR-912](https://github.com/polywrap/monorepo/pull/912) [PR-930](https://github.com/polywrap/monorepo/pull/930) [PR-958](https://github.com/polywrap/monorepo/pull/958) All URI resolver extensions have been decoupled and moved into their own plugin packages:
+  * `@polywrap/fs-resolver-plugin-js`
+  * `@polywrap/ipfs-resolver-plugin-js`
+  * `@polywrap/ens-resolver-plugin-js`
+* [PR-912](https://github.com/polywrap/monorepo/pull/912) `@polywrap/file-system-interface` has been created to help standardize FileSystem wrapper implementations.
+* [PR-930](https://github.com/polywrap/monorepo/pull/930) `@polywrap/ipfs-interface` has been created to help standardize IPFS wrapper implementations.
+
+## Bugs
+* [PR-957](https://github.com/polywrap/monorepo/pull/957) `@polywrap/schema-bind`: `plugin/typescript` module config type interfaces no longer inherit from `Record<string, unknown>`, making them more type-safe and less generic.
+
+## Breaking Changes
+* [PR-937](https://github.com/polywrap/monorepo/issues/937) [PR-960](https://github.com/polywrap/monorepo/pull/960) The term `Nullable` has been changed to `Optional` within the `wasm` wrapper codegen. Additionally in `wasm/assemblyscript` the `Nullable<T>` type has been changed to a rust-style `Optional<T>` type.
+* [PR-972](https://github.com/polywrap/monorepo/pull/972) The term `input` in the context of invocations has been renamed to `args`.
+* [PR-976](https://github.com/polywrap/monorepo/pull/976) The invocation `resultFilter` option has been deprecated, as it is a needless & unused feature.
+
 # Polywrap 0.0.1-prealpha.89
 ## Features
 * [PR-903](https://github.com/polywrap/monorepo/pull/903) `polywrap` CLI: Recipes have been re-worked into composable workflows, and they can be run using CLI commands.

VERSION

@@ -1 +1 @@
-0.0.1-prealpha.89
+0.0.1-prealpha.90

package.json

@@ -24,9 +24,13 @@
     "reset": "yarn clean && yarn && yarn build",
     "clean": "npx rimraf ./**/node_modules ./**/yarn.lock ./**/build ./**/coverage ./**/.polywrap",
     "dependencies:install": "cd dependencies && yarn",
+    "dependencies:link": "yarn link:schema:parse && yarn link:schema:bind",
+    "link:schema:parse": "cd packages/schema/parse && (yarn unlink || true) && yarn link && cd ../../../dependencies && yarn link @polywrap/schema-parse && cd ../",
+    "link:schema:bind": "cd packages/schema/bind && (yarn unlink || true) && yarn link && cd ../../../dependencies && yarn link @polywrap/schema-bind && cd ../",
     "preinstall": "yarn dependencies:install",
-    "build": "yarn build:core && yarn build:plugins && yarn build:client && yarn build:test-env && yarn build:cli",
+    "build": "yarn build:core && yarn dependencies:link && yarn build:interfaces && yarn build:plugins && yarn build:client && yarn build:test-env && yarn build:cli",
     "build:core": "lerna run build --no-private --ignore @polywrap/*-plugin-js --ignore polywrap --ignore @polywrap/client-js --ignore @polywrap/react --ignore @polywrap/test-env-js",
+    "build:interfaces": "lerna run build --scope @polywrap/*-interface --concurrency 1",
     "build:plugins": "lerna run build --scope @polywrap/*-plugin-js --concurrency 1",
     "build:client": "lerna run build --scope @polywrap/client-js --scope @polywrap/react",
     "build:test-env": "lerna run build --scope @polywrap/test-env-js",
@@ -61,6 +65,5 @@
   "resolutions": {
     "@types/react": "16.9.0",
     "@types/react-dom": "16.9.0"
-  },
-  "version": "0.0.1-prealpha.87"
+  }
 }

packages/cli/package.json

@@ -38,6 +38,7 @@
     "@polywrap/client-js": "0.0.1-prealpha.89",
     "@polywrap/core-js": "0.0.1-prealpha.89",
     "@polywrap/ens-plugin-js": "0.0.1-prealpha.89",
+    "@polywrap/ens-resolver-plugin-js": "0.0.1-prealpha.89",
     "@polywrap/ethereum-plugin-js": "0.0.1-prealpha.89",
     "@polywrap/ipfs-plugin-js": "0.0.1-prealpha.89",
     "@polywrap/os-js": "0.0.1-prealpha.89",

packages/cli/src/__tests__/e2e/create.spec.ts

@@ -2,6 +2,7 @@ import { clearStyle, polywrapCli } from "./utils";
 
 import { runCLI } from "@polywrap/test-env-js";
 import rimraf from "rimraf";
+import { ProjectType, supportedLangs } from "../../commands";
 
 const HELP = `Usage: polywrap create|c [options] [command]
 
@@ -32,7 +33,7 @@ describe("e2e tests for create command", () => {
     expect(clearStyle(output)).toEqual(HELP);
   });
 
-  test("Should throw error for missing parameter - type", async () => {
+  test("Should show help for no parameters", async () => {
     const { exitCode: code, stdout: output, stderr: error } = await runCLI({
       args: ["create"],
       cli: polywrapCli,
@@ -43,29 +44,7 @@ describe("e2e tests for create command", () => {
     expect(output).toBe("");
   });
 
-  test("Should throw error for missing parameter - lang", async () => {
-    const { exitCode: code, stdout: output, stderr: error } = await runCLI({
-      args: ["create", "type"],
-      cli: polywrapCli,
-    });
-
-    expect(code).toEqual(1);
-    expect(error).toContain("error: unknown command 'type'");
-    expect(output).toBe("");
-  });
-
-  test("Should throw error for missing parameter - name", async () => {
-    const { exitCode: code, stdout: output, stderr: error } = await runCLI({
-      args: ["create", "type", "lang"],
-      cli: polywrapCli,
-    });
-
-    expect(code).toEqual(1);
-    expect(error).toContain("error: unknown command 'type'");
-    expect(output).toBe("");
-  });
-
-  test("Should throw error for invalid parameter - type", async () => {
+  test("Should throw error for invalid project type", async () => {
     const { exitCode: code, stdout: output, stderr: error } = await runCLI({
       args: ["create", "unknown", "app", "name"],
       cli: polywrapCli,
@@ -76,49 +55,83 @@ describe("e2e tests for create command", () => {
     expect(output).toBe("");
   });
 
-  test("Should throw error for invalid parameter - lang", async () => {
-    const { exitCode: code, stdout: output, stderr: error } = await runCLI({
-      args: ["create", "wasm", "unknown", "name"],
-      cli: polywrapCli,
+  for (const project of Object.keys(supportedLangs)) {
+    describe(project, () => {
+      test("Should throw error for missing required argument - language", async () => {
+        const { exitCode: code, stdout: output, stderr: error } = await runCLI({
+          args: ["create", project],
+          cli: polywrapCli,
+        });
+    
+        expect(code).toEqual(1);
+        expect(error).toContain("error: missing required argument 'language");
+        expect(output).toBe("");
+      });
+    
+      test("Should throw error for missing required argument - name", async () => {
+        const { exitCode: code, stdout: output, stderr: error } = await runCLI({
+          args: ["create", project, "lang"],
+          cli: polywrapCli,
+        });
+    
+        expect(code).toEqual(1);
+        expect(error).toContain("error: missing required argument 'name'");
+        expect(output).toBe("");
+      });
+    
+      test("Should throw error for invalid lang parameter", async () => {
+        const { exitCode: code, stdout: output, stderr: error } = await runCLI({
+          args: ["create", project, "lang", "demo"],
+          cli: polywrapCli,
+        });
+    
+        expect(code).toEqual(1);
+        expect(error).toContain(
+          `error: command-argument value 'lang' is invalid for argument 'language'. Allowed choices are ${supportedLangs[project as ProjectType].join(", ")}.`
+        );
+        expect(output).toBe("");
+      });
+  
+      for (const lang of supportedLangs[project as ProjectType]) {
+        describe(lang, () => {
+          test("Should throw error for missing path argument for output-dir option", async () => {
+            const { exitCode: code, stdout: output, stderr: error } = await runCLI({
+              args: ["create", project, lang, "name", "-o"],
+              cli: polywrapCli,
+            });
+        
+            expect(code).toEqual(1);
+            expect(error).toContain(
+              "error: option '-o, --output-dir <path>' argument missing"
+            );
+            expect(output).toBe("");
+          });
+    
+          test("Should successfully generate project", async () => {
+            rimraf.sync(`${__dirname}/test`);
+        
+            const { exitCode: code, stdout: output } = await runCLI({
+              args: [
+                "create",
+                project,
+                lang,
+                "test",
+                "-o",
+                `${__dirname}/test`,
+              ],
+              cwd: __dirname,
+              cli: polywrapCli,
+            });
+        
+            expect(code).toEqual(0);
+            expect(clearStyle(output)).toMatch(
+              /🔥 You are ready to ([A-Za-z ]+) Polywrap 🔥/
+            );
+        
+            rimraf.sync(`${__dirname}/test`);
+          }, 60000);
+        })
+      }
     });
-
-    expect(code).toEqual(1);
-    expect(error).toContain("error: command-argument value 'unknown' is invalid for argument 'language'. Allowed choices are assemblyscript, interface.");
-    expect(output).toBe("");
-  });
-
-  test("Should throw error for invalid parameter - output-dir", async () => {
-    const { exitCode: code, stdout: output, stderr: error } = await runCLI({
-      args: ["create", "wasm", "assemblyscript", "name", "-o"],
-      cli: polywrapCli,
-    });
-
-    expect(code).toEqual(1);
-    expect(error).toContain("error: option '-o, --output-dir <path>' argument missing");
-    expect(output).toBe("");
-  });
-
-  test("Should successfully generate project", async () => {
-    rimraf.sync(`${__dirname}/test`);
-
-    const { exitCode: code, stdout: output } = await runCLI({
-      args: [
-        "create",
-        "wasm",
-        "assemblyscript",
-        "test",
-        "-o",
-        `${__dirname}/test`,
-      ],
-      cwd: __dirname,
-      cli: polywrapCli,
-    });
-
-    expect(code).toEqual(0);
-    expect(clearStyle(output)).toContain(
-      `🔥 You are ready to turn your protocol into a Polywrap 🔥`
-    );
-
-    rimraf.sync(`${__dirname}/test`);
-  }, 60000);
+  }
 });

packages/cli/src/__tests__/e2e/deploy.spec.ts

@@ -79,7 +79,7 @@ const setup = async (domainNames: string[]) => {
     const result = await client.invoke({
       uri: ensWrapperUri,
       method: "registerDomainAndSubdomainsRecursively",
-      input: {
+      args: {
         domain: domainName,
         owner: signer.address,
         registrarAddress,

packages/cli/src/cli.ts

@@ -1,14 +1,15 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import * as Commands from "./commands";
-import { Command } from "./commands/types";
 
 import { executeMaybeAsyncFunction } from "@polywrap/core-js";
 import { program } from "commander";
 
 export const run = async (argv: string[]): Promise<void> => {
-  for (const command of Object.values(Commands) as Command[]) {
-    await executeMaybeAsyncFunction(command.setup, program);
+  for (const command of Object.values(Commands)) {
+    if ("setup" in command) {
+      await executeMaybeAsyncFunction(command.setup, program);
+    }
   }
 
   program.parse(argv);

packages/cli/src/commands/create.ts

@@ -12,7 +12,7 @@ const createAppStr = intlMsg.commands_create_options_createApp();
 const createPluginStr = intlMsg.commands_create_options_createPlugin();
 const pathStr = intlMsg.commands_create_options_o_path();
 
-const supportedLangs = {
+export const supportedLangs = {
   wasm: ["assemblyscript", "interface"] as const,
   app: ["typescript-node", "typescript-react"] as const,
   plugin: ["typescript"] as const,

packages/cli/src/lib/defaults/deploy-modules/ens/index.ts

@@ -68,7 +68,7 @@ class ENSPublisher implements Deployer {
     const { data: resolver } = await client.invoke<string>({
       method: "getResolver",
       uri: ensWrapperUri,
-      input: {
+      args: {
         registryAddress: config.ensRegistryAddress,
         domain: config.domainName,
         connection: {
@@ -90,7 +90,7 @@ class ENSPublisher implements Deployer {
     const { data: setContenthashData } = await client.invoke<{ hash: string }>({
       method: "setContentHash",
       uri: ensWrapperUri,
-      input: {
+      args: {
         domain: config.domainName,
         cid: hash,
         resolverAddress: resolver,
@@ -107,7 +107,7 @@ class ENSPublisher implements Deployer {
     await client.invoke({
       method: "awaitTransaction",
       uri: ethereumPluginUri,
-      input: {
+      args: {
         txHash: setContenthashData.hash,
         confirmations: 1,
         timeout: 15000,