CLI deployment pipeline

package.json

@@ -25,7 +25,7 @@
     "reset": "yarn clean && yarn && yarn build",
     "clean": "npx rimraf ./**/node_modules ./**/yarn.lock ./**/build ./**/coverage ./**/.w3",
     "dependencies:install": "cd dependencies && yarn",
-    "dependencies:link": "cd packages/schema/bind && yarn link && cd ../../../dependencies && yarn link @web3api/schema-bind",
+    "dependencies:link": "cd packages/schema/bind && (yarn unlink || true) && yarn link && cd ../../../dependencies && yarn link @web3api/schema-bind",
     "preinstall": "yarn dependencies:install",
     "build": "yarn build:core && yarn dependencies:link && yarn build:plugins && yarn build:client && yarn build:cli",
     "build:core": "lerna run build --no-private --ignore @web3api/*-plugin-js --ignore @web3api/cli* --ignore @web3api/react",

packages/cli/lang/en.json

@@ -1,30 +1,33 @@
 {
-  "commands_build_address": "ENS Address",
-  "commands_build_description": "Builds a Web3API and (optionally) uploads it to IPFS",
-  "commands_build_ensRegistry": "ENS Registry",
+  "commands_build_description": "Builds a Web3API",
   "commands_build_error_manifestPathMissing": "{option} option missing {argument} argument",
   "commands_build_error_manifestNotFound": "Manifest not found. Search paths used: {paths}",
   "commands_build_error_outputDirMissingPath": "{option} option missing {argument} argument",
-  "commands_build_error_resolution": "ENS Resolution Failed",
-  "commands_build_error_testEnsAddressMissing": "{option} option missing {argument} argument",
-  "commands_build_error_testEnsNodeMissing": "{option} option requires the {required} option",
-  "commands_build_ethProvider": "Ethereum Provider",
   "commands_build_keypressListener_exit": "Exit: [CTRL + C], [ESC], or [Q]",
   "commands_build_keypressListener_watching": "Watching",
-  "commands_build_options_e": "Publish the package to a test ENS domain locally (requires --ipfs)",
-  "commands_build_options_e_address": "address",
-  "commands_build_options_e_domain": "domain",
   "commands_build_options_h": "Show usage information",
   "commands_build_options_m": "Path to the Web3API Build manifest file (default: {default})",
-  "commands_build_options_i": "Upload build results to an IPFS node (default: dev-server's node)",
-  "commands_build_options_i_node": "node",
   "commands_build_options_o": "Output directory for build results (default: build/)",
   "commands_build_options_o_path": "path",
   "commands_build_options_options": "options",
   "commands_build_options_t": "Use the development server's ENS instance",
   "commands_build_options_w": "Automatically rebuild when changes are made (default: false)",
   "commands_build_options_v": "Verbose output (default: false)",
   "commands_build_uriViewers": "URI Viewers",
+  "commands_deploy_description": "Deploys/Publishes a Web3API",
+  "commands_deploy_options_options": "options",
+  "commands_deploy_options_o_path": "path",
+  "commands_deploy_options_o_string": "string",
+  "commands_deploy_options_h": "Show usage information",
+  "commands_deploy_options_m": "Path to the Web3API Deploy manifest file (default: {default})",
+  "commands_deploy_options_n": "Name of the deployment to execute",
+  "commands_deploy_options_c": "Argument for deployment's publish step, in case deploy step is absent",
+  "commands_deploy_options_v": "Verbose output (default: false)",
+  "commands_deploy_options_p": "Path to the build directory",
+  "commands_deploy_error_manifestPathMissing": "{option} option missing {argument} argument",
+  "commands_deploy_error_pathMissing": "{option} option missing {argument} argument",
+  "commands_deploy_error_nameMissing": "{option} option missing {argument} argument",
+  "commands_deploy_error_cidMissing": "{option} option missing {argument} argument",
   "commands_codegen_description": "Auto-generate API Types",
   "commands_codegen_error_domain": "domain",
   "commands_codegen_error_optionMissingArgument": "{option} option missing {argument} argument",
@@ -189,6 +192,9 @@
   "lib_helpers_manifest_loadError": "Failed to load manifest from {path}",
   "lib_helpers_manifest_loadText": "Manifest loaded from {path}",
   "lib_helpers_manifest_loadWarning": "Warnings loading manifest from {path}",
+  "lib_helpers_deployManifestExt_loadError": "Failed to load deploy manifest extension from {path}",
+  "lib_helpers_deployManifestExt_loadText": "Load manifest extension from {path}",
+  "lib_helpers_deployManifestExt_loadWarning": "No manifest extension found in {path}",
   "lib_helpers_manifest_outputError": "Failed to output manifest to {path}",
   "lib_helpers_manifest_outputText": "Manifest written to {path}",
   "lib_helpers_manifest_outputWarning": "Warnings writing manifest to {path}",

packages/cli/lang/es.json

@@ -1,30 +1,34 @@
 {
-  "commands_build_address": "ENS Address",
-  "commands_build_description": "Builds a Web3API and (optionally) uploads it to IPFS",
-  "commands_build_ensRegistry": "ENS Registry",
+  "commands_build_description": "Builds a Web3API",
   "commands_build_error_manifestPathMissing": "{option} option missing {argument} argument",
   "commands_build_error_manifestNotFound": "Manifest not found. Search paths used: {paths}",
   "commands_build_error_outputDirMissingPath": "{option} option missing {argument} argument",
-  "commands_build_error_resolution": "ENS Resolution Failed",
-  "commands_build_error_testEnsAddressMissing": "{option} option missing {argument} argument",
-  "commands_build_error_testEnsNodeMissing": "{option} option requires the {required} option",
-  "commands_build_ethProvider": "Ethereum Provider",
   "commands_build_keypressListener_exit": "Exit: [CTRL + C], [ESC], or [Q]",
   "commands_build_keypressListener_watching": "Watching",
-  "commands_build_options_e": "Publish the package to a test ENS domain locally (requires --ipfs)",
-  "commands_build_options_e_address": "address",
-  "commands_build_options_e_domain": "domain",
   "commands_build_options_h": "Show usage information",
   "commands_build_options_m": "Path to the Web3API Build manifest file (default: {default})",
-  "commands_build_options_i": "Upload build results to an IPFS node (default: dev-server's node)",
-  "commands_build_options_i_node": "node",
+
   "commands_build_options_o": "Output directory for build results (default: build/)",
   "commands_build_options_o_path": "path",
   "commands_build_options_options": "options",
   "commands_build_options_t": "Use the development server's ENS instance",
   "commands_build_options_w": "Automatically rebuild when changes are made (default: false)",
   "commands_build_options_v": "Verbose output (default: false)",
   "commands_build_uriViewers": "URI Viewers",
+  "commands_deploy_description": "Deploys/Publishes a Web3API",
+  "commands_deploy_options_options": "options",
+  "commands_deploy_options_o_path": "path",
+  "commands_deploy_options_o_string": "string",
+  "commands_deploy_options_h": "Show usage information",
+  "commands_deploy_options_m": "Path to the Web3API Deploy manifest file (default: {default})",
+  "commands_deploy_options_n": "Name of the deployment to execute",
+  "commands_deploy_options_c": "Argument for deployment's publish step, in case deploy step is absent",
+  "commands_deploy_options_v": "Verbose output (default: false)",
+  "commands_deploy_options_p": "Path to the build directory",
+  "commands_deploy_error_manifestPathMissing": "{option} option missing {argument} argument",
+  "commands_deploy_error_pathMissing": "{option} option missing {argument} argument",
+  "commands_deploy_error_nameMissing": "{option} option missing {argument} argument",
+  "commands_deploy_error_cidMissing": "{option} option missing {argument} argument",
   "commands_codegen_description": "Auto-generate API Types",
   "commands_codegen_error_domain": "domain",
   "commands_codegen_error_optionMissingArgument": "{option} option missing {argument} argument",
@@ -189,6 +193,9 @@
   "lib_helpers_manifest_loadError": "Failed to load manifest from {path}",
   "lib_helpers_manifest_loadText": "Manifest loaded from {path}",
   "lib_helpers_manifest_loadWarning": "Warnings loading manifest from {path}",
+  "lib_helpers_deployManifestExt_loadError": "Failed to load deploy manifest extension from {path}",
+  "lib_helpers_deployManifestExt_loadText": "Deploy manifest extension loaded from {path}",
+  "lib_helpers_deployManifestExt_loadWarning": "No deploy manifest extension found in {path}",
   "lib_helpers_manifest_outputError": "Failed to output manifest to {path}",
   "lib_helpers_manifest_outputText": "Manifest written to {path}",
   "lib_helpers_manifest_outputWarning": "Warnings writing manifest to {path}",

packages/cli/package.json

@@ -16,8 +16,9 @@
     "w3": "bin/w3"
   },
   "scripts": {
-    "build": "rimraf ./build && tsc --project tsconfig.build.json && yarn build:envs",
+    "build": "rimraf ./build && tsc --project tsconfig.build.json && yarn build:envs && yarn build:deployers",
     "build:envs": "copyfiles ./src/lib/build-envs/**/**/* ./build/lib/build-envs/ -u 3",
+    "build:deployers": "copyfiles ./src/lib/deployers/**/web3api.deploy.ext.json ./build/lib/deployers -u 3",
     "prebuild": "ts-node ./scripts/generateIntlTypes.ts",
     "lint": "eslint --color -c ../../.eslintrc.js .",
     "test": "cross-env TEST=true jest --passWithNoTests --runInBand --verbose",
@@ -40,6 +41,9 @@
     "@web3api/schema-bind": "0.0.1-prealpha.74",
     "@web3api/schema-compose": "0.0.1-prealpha.74",
     "@web3api/schema-parse": "0.0.1-prealpha.74",
+    "ethers": "5.6.2",
+    "@ensdomains/ensjs": "2.0.1",
+    "content-hash": "2.5.2",
     "assemblyscript": "0.19.1",
     "axios": "0.21.2",
     "chalk": "4.1.0",

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

@@ -12,16 +12,14 @@ w3 build [options]
 Options:
   -h, --help                         Show usage information
   -m, --manifest-file <path>         Path to the Web3API Build manifest file (default: web3api.yaml | web3api.yml)
-  -i, --ipfs [<node>]                Upload build results to an IPFS node (default: dev-server's node)
   -o, --output-dir <path>            Output directory for build results (default: build/)
-  -e, --test-ens <[address,]domain>  Publish the package to a test ENS domain locally (requires --ipfs)
   -w, --watch                        Automatically rebuild when changes are made (default: false)
   -v, --verbose                      Verbose output (default: false)
 
 `;
 
 describe("e2e tests for build command", () => {
-  const testCaseRoot = path.join(GetPathToCliTestFiles(), "api/build");
+  const testCaseRoot = path.join(GetPathToCliTestFiles(), "api/build-cmd");
   const testCases =
     fs.readdirSync(testCaseRoot, { withFileTypes: true })
       .filter((dirent) => dirent.isDirectory())
@@ -59,38 +57,6 @@ describe("e2e tests for build command", () => {
 ${HELP}`);
   });
 
-  test("Should throw error for invalid params - testEns", async () => {
-    const { exitCode: code, stdout: output, stderr: error } = await runCLI(
-      {
-        args: ["build", "--test-ens"],
-        cwd: getTestCaseDir(0),
-        cli: w3Cli,
-      },
-    );
-
-    expect(code).toEqual(1);
-    expect(error).toBe("");
-    expect(clearStyle(output))
-      .toEqual(`--test-ens option missing <[address,]domain> argument
-${HELP}`);
-  });
-
-  test("Should throw error for invalid params - ipfs", async () => {
-    const { exitCode: code, stdout: output, stderr: error } = await runCLI(
-      {
-        args: ["build", "--test-ens", "test.eth"],
-        cwd: getTestCaseDir(0),
-        cli: w3Cli,
-      },
-    );
-
-    expect(code).toEqual(1);
-    expect(error).toBe("");
-    expect(clearStyle(output))
-      .toEqual(`--test-ens option requires the --ipfs [<node>] option
-${HELP}`);
-  });
-
   test("Adds uuid-v4 suffix to build-env image if no build manifest specified", async () => {
     const projectRoot = getTestCaseDir(0);
     const project = new Web3ApiProject({