Small revisions and fixes For Wasm templates

packages/templates/wasm/assemblyscript/package.json

@@ -6,13 +6,9 @@
   "scripts": {
     "codegen": "npx polywrap codegen",
     "build": "npx polywrap build",
-    "test:env:up": "npx polywrap infra up --modules=eth-ens-ipfs",
-    "test:env:down": "npx polywrap infra down --modules=eth-ens-ipfs",
     "deploy": "npx polywrap deploy",
-    "test": "yarn test:e2e && yarn test:workflow",
-    "test:e2e": "yarn test:e2e:codegen && jest --passWithNoTests --runInBand --verbose",
-    "test:e2e:codegen": "npx polywrap codegen -m ./src/__tests__/types/polywrap.app.yaml -g ./src/__tests__/types/wrap",
-    "test:workflow": "npx polywrap test -o ./workflows/output.json"
+    "test": "yarn test:codegen && jest --passWithNoTests --runInBand --verbose",
+    "test:codegen": "npx polywrap codegen -m ./src/__tests__/types/polywrap.app.yaml -g ./src/__tests__/types/wrap"
   },
   "devDependencies": {
     "@types/jest": "26.0.8",

packages/templates/wasm/assemblyscript/polywrap.yaml

@@ -5,5 +5,3 @@ project:
 source:
   module: ./src/index.ts
   schema: ./polywrap.graphql
-extensions:
-  build: ./polywrap.build.yaml

packages/templates/wasm/assemblyscript/src/__tests__/e2e/integration.spec.ts

@@ -1,31 +1,25 @@
-import { PolywrapClient } from "@polywrap/client-js";
 import * as App from "../types/wrap";
 import path from "path";
 
 jest.setTimeout(60000);
 
 describe("Template Wrapper End to End Tests", () => {
 
-  const client: PolywrapClient = new PolywrapClient();
+  let template: App.Template;
   let wrapperUri: string;
 
   beforeAll(() => {
-    const dirname: string = path.resolve(__dirname);
-    const wrapperPath: string = path.join(dirname, "..", "..", "..");
+    const wrapperPath: string = path.join(__dirname, "..", "..", "..");
     wrapperUri = `fs/${wrapperPath}/build`;
+    template = new App.Template(undefined, undefined, wrapperUri)
   })
 
   it("calls sampleMethod", async () => {
     const expected: string = "polywrap";
 
-    const result = await client.invoke<App.Template_SampleResult>({
-      uri: wrapperUri,
-      method: "sampleMethod",
-      args: { arg: expected }
-    });
+    const result = await template.sampleMethod({ arg: expected })
 
-    expect(result.ok).toBeTruthy();
-    if (!result.ok) return;
+    if (!result.ok) throw result.error;
     expect(result.value.result).toEqual(expected);
   });
 });

packages/templates/wasm/golang/module/__tests__/e2e/integration.spec.ts

@@ -1,31 +1,25 @@
-import { PolywrapClient } from "@polywrap/client-js";
 import * as App from "../types/wrap";
 import path from "path";
 
 jest.setTimeout(60000);
 
 describe("Template Wrapper End to End Tests", () => {
 
-  const client: PolywrapClient = new PolywrapClient();
+  let template: App.Template;
   let wrapperUri: string;
 
   beforeAll(() => {
-    const dirname: string = path.resolve(__dirname);
-    const wrapperPath: string = path.join(dirname, "..", "..", "..");
+    const wrapperPath: string = path.join(__dirname, "..", "..", "..");
     wrapperUri = `fs/${wrapperPath}/build`;
+    template = new App.Template(undefined, undefined, wrapperUri)
   })
 
   it("calls sampleMethod", async () => {
     const expected: string = "polywrap";
 
-    const result = await client.invoke<App.Template_SampleResult>({
-      uri: wrapperUri,
-      method: "sampleMethod",
-      args: { arg: expected }
-    });
+    const result = await template.sampleMethod({ arg: expected })
 
-    expect(result.ok).toBeTruthy();
-    if (!result.ok) return;
+    if (!result.ok) throw result.error;
     expect(result.value.result).toEqual(expected);
   });
 });

packages/templates/wasm/golang/package.json

@@ -7,10 +7,8 @@
     "codegen": "npx polywrap codegen",
     "build": "npx polywrap build",
     "deploy": "npx polywrap deploy",
-    "test": "yarn test:e2e && yarn test:workflow",
-    "test:e2e": "yarn test:e2e:codegen && jest --passWithNoTests --runInBand --verbose",
-    "test:e2e:codegen": "npx polywrap codegen -m ./module/__tests__/types/polywrap.app.yaml -g ./module/__tests__/types/wrap",
-    "test:workflow": "npx polywrap test"
+    "test": "yarn test:codegen && jest --passWithNoTests --runInBand --verbose",
+    "test:codegen": "npx polywrap codegen -m ./module/__tests__/types/polywrap.app.yaml -g ./module/__tests__/types/wrap"
   },
   "devDependencies": {
     "@types/jest": "26.0.8",

packages/templates/wasm/golang/polywrap.yaml

@@ -4,4 +4,4 @@ project:
   type: wasm/golang
 source:
   schema: ./polywrap.graphql
-  module: ./go.mod
+  module: ./go.mod

packages/templates/wasm/rust/package.json

@@ -7,10 +7,8 @@
     "codegen": "npx polywrap codegen",
     "build": "npx polywrap build",
     "deploy": "npx polywrap deploy",
-    "test": "yarn test:e2e && yarn test:workflow",
-    "test:e2e": "yarn test:e2e:codegen && cargo test --release",
-    "test:e2e:codegen": "npx polywrap codegen -m ./tests/types/polywrap.app.yaml -g ./tests/types/wrap",
-    "test:workflow": "npx polywrap test"
+    "test": "yarn test:codegen && cargo test --release",
+    "test:codegen": "npx polywrap codegen -m ./tests/types/polywrap.app.yaml -g ./tests/types/wrap"
   },
   "devDependencies": {
     "polywrap": "0.12.1"

packages/templates/wasm/rust/polywrap.yaml

@@ -4,6 +4,4 @@ project:
   type: wasm/rust
 source:
   module: ./Cargo.toml
-  schema: ./polywrap.graphql
-extensions:
-  build: ./polywrap.build.yaml
+  schema: ./polywrap.graphql

packages/templates/wasm/rust/tests/it/module.rs

@@ -1,14 +1,14 @@
 use crate::types::wrap::types::{
-    TemplateModule,
-    TemplateModuleArgsSampleMethod
+    Template,
+    TemplateArgsSampleMethod
 };
 
 #[test]
 fn sample_method() {
-    let args = TemplateModuleArgsSampleMethod {
+    let args = TemplateArgsSampleMethod {
         arg: "input data".to_string(),
     };
-    let template: TemplateModule = TemplateModule::new(None, None, None);
-    let response = template.sample_method(&args, None, None, None).unwrap();
+    let template: Template = Template::new(None);
+    let response = template.sample_method(&args, None).unwrap();
     assert_eq!(response.result, "input data from sample_method");
 }

packages/templates/wasm/typescript/package.json

@@ -6,10 +6,11 @@
   "main": "build/index.js",
   "scripts": {
     "bundle": "rollup -c",
-    "codegen": "polywrap codegen --verbose",
-    "build": "yarn bundle && npx polywrap build --no-codegen",
-    "test": "jest --passWithNoTests --runInBand --verbose",
-    "deploy": "polywrap deploy"
+    "codegen": "npx polywrap codegen",
+    "build": "yarn codegen && yarn bundle && npx polywrap build --no-codegen",
+    "deploy": "npx polywrap deploy",
+    "test": "yarn test:codegen && jest --passWithNoTests --runInBand --verbose",
+    "test:codegen": "npx polywrap codegen -m ./src/__tests__/types/polywrap.app.yaml -g ./src/__tests__/types/wrap"
   },
   "dependencies": {
     "tslib": "^2.6.2"

packages/templates/wasm/typescript/polywrap.graphql

@@ -1,3 +1,7 @@
 type Module {
-  foo(bar: String!): String!
+    sampleMethod(arg: String!): SampleResult!
+}
+
+type SampleResult {
+    result: String!
 }

packages/templates/wasm/typescript/src/__tests__/e2e/integration.spec.ts

@@ -0,0 +1,25 @@
+import * as App from "../types/wrap";
+import path from "path";
+
+jest.setTimeout(60000);
+
+describe("Template Wrapper End to End Tests", () => {
+
+  let template: App.Template;
+  let wrapperUri: string;
+
+  beforeAll(() => {
+    const wrapperPath: string = path.join(__dirname, "..", "..", "..");
+    wrapperUri = `fs/${wrapperPath}/build`;
+    template = new App.Template(undefined, undefined, wrapperUri)
+  })
+
+  it("calls sampleMethod", async () => {
+    const expected: string = "polywrap";
+
+    const result = await template.sampleMethod({ arg: expected })
+
+    if (!result.ok) throw result.error;
+    expect(result.value.result).toEqual(expected);
+  });
+});

packages/templates/wasm/typescript/src/__tests__/types/polywrap.app.yaml

@@ -0,0 +1,9 @@
+format: 0.3.0
+project:
+  name: sample-typescript-type-generation
+  type: app/typescript
+source:
+  schema: ./schema.graphql
+  import_abis:
+    - uri: "wrap://ens/sample.eth"
+      abi: "../../../build/wrap.info"

packages/templates/wasm/typescript/src/__tests__/types/schema.graphql

@@ -0,0 +1 @@
+#import * into Template from "wrap://ens/sample.eth"

packages/templates/wasm/typescript/src/index.ts

@@ -1,7 +1,9 @@
-import { Args_foo, ModuleBase } from "./wrap";
+import { Args_sampleMethod, SampleResult, ModuleBase } from "./wrap";
 
 export class Module extends ModuleBase {
-  foo(args: Args_foo): string {
-    throw new Error("Not implemented");
+  sampleMethod(args: Args_sampleMethod): SampleResult {
+    return {
+      result: args.arg,
+    };
   }
 }