Merge pull request #1841 from polywrap/origin-0.11-dev

Prep Origin 0.11 | /workflows/release-pr

Author: dOrgJelli

.github/workflows/cd-containers.yaml

@@ -42,18 +42,22 @@ jobs:
         run: |
           echo IMAGE_RS_VM_DIR=./packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm >> $GITHUB_ENV
           echo IMAGE_AS_VM_DIR=./packages/cli/src/lib/defaults/build-strategies/wasm/assemblyscript/vm >> $GITHUB_ENV
+          echo IMAGE_GO_VM_DIR=./packages/cli/src/lib/defaults/build-strategies/wasm/golang/vm >> $GITHUB_ENV
 
       - name: Read Image VERSION & NAME into env.IMAGE_..._VERSION/NAME
         run: |
           echo IMAGE_RS_VM_NAME=$(cat $IMAGE_RS_VM_DIR/NAME) >> $GITHUB_ENV
           echo IMAGE_RS_VM_VERSION=$(cat $IMAGE_RS_VM_DIR/VERSION) >> $GITHUB_ENV
           echo IMAGE_AS_VM_NAME=$(cat $IMAGE_AS_VM_DIR/NAME) >> $GITHUB_ENV
           echo IMAGE_AS_VM_VERSION=$(cat $IMAGE_AS_VM_DIR/VERSION) >> $GITHUB_ENV
+          echo IMAGE_GO_VM_NAME=$(cat $IMAGE_GO_VM_DIR/NAME) >> $GITHUB_ENV
+          echo IMAGE_GO_VM_VERSION=$(cat $IMAGE_GO_VM_DIR/VERSION) >> $GITHUB_ENV
 
       - name: Check if image tags already exist
         run: |
           echo IMAGE_RS_VM_UNPUBLISHED=$(! curl -s "https://hub.docker.com/v2/repositories/$IMAGE_RS_VM_NAME/tags/$IMAGE_RS_VM_VERSION" | grep -q "error 404" > /dev/null ; echo $?) >> $GITHUB_ENV
           echo IMAGE_AS_VM_UNPUBLISHED=$(! curl -s "https://hub.docker.com/v2/repositories/$IMAGE_AS_VM_NAME/tags/$IMAGE_AS_VM_VERSION" | grep -q "error 404" > /dev/null ; echo $?) >> $GITHUB_ENV
+          echo IMAGE_GO_VM_UNPUBLISHED=$(! curl -s "https://hub.docker.com/v2/repositories/$IMAGE_GO_VM_NAME/tags/$IMAGE_GO_VM_VERSION" | grep -q "error 404" > /dev/null ; echo $?) >> $GITHUB_ENV
 
       - name: Build & Publish RS VM Image
         if: env.IMAGE_RS_VM_UNPUBLISHED == '1'
@@ -70,3 +74,11 @@ jobs:
           docker buildx create --use --name as-vm-builder
           docker buildx build . --platform=linux/amd64,linux/arm64 -t $IMAGE_AS_VM_NAME:latest -t $IMAGE_AS_VM_NAME:$IMAGE_AS_VM_VERSION --output type=registry
           docker buildx rm as-vm-builder
+
+      - name: Build & Publish GO VM Image
+        if: env.IMAGE_GO_VM_UNPUBLISHED == '1'
+        working-directory: ${{env.IMAGE_GO_VM_DIR}}
+        run: |
+          docker buildx create --use --name go-vm-builder
+          docker buildx build . --platform=linux/amd64,linux/arm64 -t $IMAGE_GO_VM_NAME:latest -t $IMAGE_GO_VM_NAME:$IMAGE_GO_VM_VERSION --output type=registry
+          docker buildx rm go-vm-builder

.github/workflows/ci-golang.yaml

@@ -0,0 +1,45 @@
+name: CI-Golang
+
+on: 
+  push:
+    branches:
+      - origin
+      - origin-dev
+  pull_request:
+
+jobs:
+  Test-Cli:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Read .nvmrc
+        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
+        id: nvm
+
+      - name: Setup Node.js
+        uses: actions/setup-node@master
+        with:
+          node-version: '${{ steps.nvm.outputs.NVMRC }}'
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Install dependencies
+        run: yarn install --nonInteractive --frozen-lockfile --prefer-offline
+
+      - name: Build
+        run: yarn build
+
+      - name: Test
+        run: yarn test:golang
+        working-directory: ./packages/cli

.github/workflows/ci-javascript.yaml

@@ -83,9 +83,8 @@ jobs:
   CI-WRAP-Test-Harness:
     uses: ./.github/workflows/ci-wrap-test-harness.yaml
 
-  Test-Core:
+  Test-Templates:
     runs-on: ubuntu-latest
-    needs: CI-WRAP-Test-Harness
     timeout-minutes: 60
     if: ${{ always() }}
     steps:
@@ -139,18 +138,63 @@ jobs:
       - name: Build
         run: yarn build
 
-      - name: Get updated wrappers
-        if: ${{ needs.CI-WRAP-Test-Harness.outputs.rebuild_required == 'true' }}
-        uses: actions/download-artifact@v3
-        id: get-wrappers
+      - name: Test
+        run: yarn test:templates
+
+  Test-Core:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    if: ${{ always() }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Read .nvmrc
+        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
+        id: nvm
+
+      - name: Setup Node.js
+        uses: actions/setup-node@master
         with:
-          name: rebuilt-wrappers
-          path: ./wrappers
+          node-version: '${{ steps.nvm.outputs.NVMRC }}'
 
-      - if: ${{ needs.CI-WRAP-Test-Harness.outputs.rebuild_required == 'true' }}
-        run: |
-          rm -rf packages/test-cases/cases/wrappers
-          mv wrappers packages/test-cases/cases
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Setup Poetry
+        uses: abatilo/actions-poetry@v2
+        with:
+          poetry-version: '1.4.2'
+
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: '^1.13.1'
+
+      - name: Install cue lang
+        run: go install cuelang.org/go/cmd/cue@latest
+
+      - name: Check if cue is installed
+        run: cue version
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Install dependencies
+        run: yarn install --nonInteractive --frozen-lockfile --prefer-offline
+
+      - name: Build
+        run: yarn build
 
       - name: Test
         run: yarn test:core
@@ -224,3 +268,7 @@ jobs:
       - name: Test cli:e2e:p2
         run: yarn test:e2e:p2
         working-directory: ./packages/cli
+
+      - name: Test CLI JS
+        run: yarn test
+        working-directory: ./packages/js/cli

CHANGELOG.md

@@ -1,3 +1,37 @@
+# Polywrap Origin (0.11.0)
+## Features
+**`polywrap` CLI:**
+* [PR-1074](https://github.com/polywrap/cli/pull/1074) **Golang-based Wraps Now Supported!**
+  * Polywrap projects of `type: wasm/golang` are now supported.
+  * To get started, simply run `polywrap create wasm golang my-wrap`
+* [PR-1829](https://github.com/polywrap/cli/pull/1829) **Support User-Defined Bindgen URIs**
+  * The `build` and `codegen` commands now have the option `--bindgen <URI>`, which allows for the use of a custom bindgen wrap.
+* [PR-1774](https://github.com/polywrap/cli/pull/1774) **`polywrap deploy` Defaults To IPFS on wrapscan.io**
+  * When you run the `polywrap deploy` command, you no longer need a `polywrap.deploy.yaml` manifest file. By default it will deploy your wrap to IPFS on https://wrapscan.io.
+
+**`@polywrap/schema-bind`:**
+* [PR-1795](https://github.com/polywrap/cli/pull/1795) **Add `wrap-abi-bindgen` Support**
+  * All wrap bindings are now emitted using the wraps defined within the [wrap-abi-bindgen](https://github.com/polywrap/wrap-abi-bindgen) project.
+  * This enables binding updates to be released, without us needing to create a new release of the CLI.
+* [PR-1840](https://github.com/polywrap/cli/pull/1840) **Support Swift Plugin Bindings**
+  * Add support for `plugin/swift` bindings, used when building plugins in Swift.
+
+## Breaking Changes
+**`polywrap` CLI:**
+* [PR-1809](https://github.com/polywrap/cli/pull/1809) **`docgen` Command Removed**
+  * The `docgen` command has been largely unused so it has been removed.
+* [PR-1839](https://github.com/polywrap/cli/pull/1839) **Remove ENS Deploy Modules**
+  * All ENS deploy modules have been removed. If you'd like to publish your wrap's IPFS hash to ENS, simply use the [ENS web app](https://ens.domains/).
+
+## Bugs
+**`polywrap` CLI:**
+* [PR-1823](https://github.com/polywrap/cli/pull/1823) **Support Fuzzy URI Strings in Manifests**
+  * URIs within manifest files are no longer as strict, and can be any string.
+* [PR-1808](https://github.com/polywrap/cli/pull/1808) **IPFS Deploy W/ Node v18**
+  * The IPFS deployer module has been updated so that it runs on all node versions, including version 18.
+* [PR-1804](https://github.com/polywrap/cli/pull/1804) **Emit Resources & Docs For Interface Wraps**
+  * When building an wrap of type `interface`, resources and doc artifacts were not being properly emitted to the build folder.
+
 # Polywrap Origin (0.10.6)
 ## Bugs
 **`polywrap` CLI:**

VERSION

@@ -1 +1 @@
-0.10.6
+0.11.0

WRAP_TEST_HARNESS

@@ -1 +1 @@
-master
+chore/latest-rust-wrap-bindings

package.json

@@ -31,11 +31,14 @@
     "lint:fix": "lerna run lint -- --fix",
     "lint:ci": "yarn lint",
     "test": "lerna run test --no-private --concurrency 1",
-    "test:core": "lerna run test --no-private --ignore polywrap* --concurrency 1",
-    "test:cli": "yarn test:cli:unit && yarn test:cli:e2e",
-    "test:cli:unit": "lerna run test:unit --no-private --scope polywrap --concurrency 1",
-    "test:cli:e2e:p1": "lerna run test:e2e:p1 --no-private --scope polywrap --concurrency 1",
-    "test:cli:e2e:p2": "lerna run test:e2e:p2 --no-private --scope polywrap --concurrency 1",
+    "test:core": "lerna run test --no-private --ignore polywrap* --ignore @polywrap/cli-js --ignore @polywrap/templates --concurrency 1",
+    "test:cli": "yarn test:cli:unit && yarn test:cli:e2e && yarn test:cli:js",
+    "test:cli:unit": "lerna run test:unit --scope polywrap --concurrency 1",
+    "test:cli:e2e": "yarn test:cli:e2e:p1 && yarn test:cli:e2e:p2",
+    "test:cli:e2e:p1": "lerna run test:e2e:p1 --scope polywrap --concurrency 1",
+    "test:cli:e2e:p2": "lerna run test:e2e:p2 --scope polywrap --concurrency 1",
+    "test:cli:js": "lerna run test --scope @polywrap/cli-js --concurrency 1",
+    "test:templates": "lerna run test --no-private --scope @polywrap/templates --concurrency 1",
     "version:apply": "lerna version $(cat VERSION) --exact --no-git-tag-version --yes",
     "postversion:apply": "git add . && git commit -m \"build(release): migrate to `cat ./VERSION`\"",
     "publish:npm": "lerna exec --no-private --concurrency 1 -- yarn publish --access public --non-interactive --verbose",
@@ -58,6 +61,7 @@
   },
   "resolutions": {
     "@types/react": "16.9.0",
-    "@types/react-dom": "16.9.0"
+    "@types/react-dom": "16.9.0",
+    "@types/node": "18.15.0"
   }
 }

packages/cli/jest.config.js

@@ -11,7 +11,8 @@ module.exports = {
   modulePathIgnorePatterns: [
     "<rootDir>/build",
     "<rootDir>/src/__tests__/project/.polywrap",
-    "<rootDir>/src/__tests__/e2e/build-rs.spec.ts"
+    "<rootDir>/src/__tests__/e2e/build-rs.spec.ts",
+    "<rootDir>/src/__tests__/e2e/build-go.spec.ts"
   ],
   testPathIgnorePatterns: [
     "<rootDir>/src/__tests__/project/.polywrap"

packages/cli/jest.go.config.js

@@ -0,0 +1,22 @@
+module.exports = {
+  collectCoverage: true,
+  preset: "ts-jest",
+  testEnvironment: "node",
+  globals: {
+    "ts-jest": {
+      diagnostics: false
+    },
+  },
+  modulePathIgnorePatterns: [
+    "<rootDir>/build",
+    "<rootDir>/src/__tests__/project/.polywrap"
+  ],
+  testPathIgnorePatterns: [
+    "<rootDir>/src/__tests__/project/.polywrap"
+  ],
+  transformIgnorePatterns: [
+    "<rootDir>/src/__tests__/project/.polywrap"
+  ],
+  setupFilesAfterEnv: ["./jest.setup.js"],
+  testMatch: ["**/build-go.spec.ts"]
+};

packages/cli/lang/en.json

@@ -9,6 +9,7 @@
   "commands_build_description": "Build Polywrap Projects (type: interface, wasm)",
   "commands_build_error_manifestPathMissing": "{option} option missing {argument} argument",
   "commands_build_error_manifestNotFound": "Manifest not found. Search paths used: {paths}",
+  "commands_build_error_goModNotFound": "go.mod file not found. Search paths used: {paths}",
   "commands_build_error_outputDirMissingPath": "{option} option missing {argument} argument",
   "commands_build_error_unsupportedProjectType": "Unsupported project type. You can only build the following project types: {supportedTypes}",
   "commands_build_keypressListener_exit": "Exit: [CTRL + C], [ESC], or [Q]",
@@ -91,19 +92,11 @@
   "commands_codegen_options_m": "Path to the Polywrap manifest file (default: {default})",
   "commands_codegen_options_o": "Output directory for custom generated types (default: 'types/')",
   "commands_codegen_options_o_path": "path",
+  "commands_codegen_options_b": "Uri for custom bindgen wrap (must implement wrap-abi-bindgen interface; see https://github.com/polywrap/wrap-abi-bindgen)",
   "commands_codegen_success": "Types were generated successfully",
+  "commands_codegen_invalid_uri": "Invalid WRAP URI format: {uri}.",
   "commands_codegen_project_load_error": "Failed to load project, please make sure {manifestPath} is a valid Project manifest",
   "commands_codegen_options_publish": "Output path for the built schema and manifest (default: {default})",
-  "commands_docgen_description": "Generate wrapper documentation",
-  "commands_docgen_success": "Docs were generated successfully",
-  "commands_docgen_default": "default",
-  "commands_docgen_options_c": "Output directory for generated docs (default: {default})",
-  "commands_docgen_options_m": "Path to the project manifest file (default: {default})",
-  "commands_docgen_options_schema": "Generate GraphQL schema",
-  "commands_docgen_options_markdown": "Generate {framework} markdown",
-  "commands_docgen_options_i": "Also generate docs for dependencies",
-  "commands_docgen_error_manifestNotFound": "Manifest not found. Search paths used: {paths}",
-  "commands_docgen_error_projectLoadFailed": "Could not load project form the given manifest. Manifest: `{manifestFile}`",
   "commands_create_description": "Create New Projects",
   "commands_create_directoryExists": "Directory with name {dir} already exists",
   "commands_create_error_commandFail": "Command failed: {error}",
@@ -176,7 +169,6 @@
   "commands_test_error_unsupportedOutputFileExt": "Unsupported outputFile extention: {outputFileExt}",
   "commands_test_error_cueDoesNotExist": "Require cue to run validator, checkout https://cuelang.org/ for more information",
   "commands_test_error_noWorkflowScriptFound": "Workflow script not found at path: {path}",
-  "commands_test_error_noTestEnvFound": "polywrap test-env not found, please run 'polywrap infra up --modules=eth-ens-ipfs'",
   "commands_polywrap_error_notACommand": "is not a command",
   "commands_polywrap_helpPrompt": "Type {command} to view common commands",
   "commands_manifest_description": "Inspect & Migrade Polywrap Manifests",
@@ -243,6 +235,8 @@
   "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_gomod_unableToLoad": "Unable to load go.mod: {path}",
+  "lib_helpers_gomod_invalid": "Invalid format of go.mod: {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}",
@@ -282,6 +276,7 @@
   "lib_typescript_tsNodeNotInstalled": "Your project uses typescript, but ts-node is not installed",
   "lib_watcher_alreadyWatching": "Watcher session is already in progress. Directory: {dir}",
   "lib_wasm_rust_invalidModule": "Module paths must point to Cargo.toml files. Found: {path}",
+  "lib_wasm_golang_invalidModule": "Module paths must point to go.mod file. Found: {path}",
   "lib_docker_invalidImageId": "Invalid docker image ID returned: {imageId}",
   "lib_docker_noInstall": "Docker executable not found in PATH",
   "lib_infra_unrecognizedModule": "Unrecognized modules: {modules}. Default modules: {defaultModules}",