Merge pull request #938 from polywrap/chore/rollback-serial-as-json

Chore: Rollback JSON Serialization in AS

packages/cli/src/lib/defaults/build-images/wasm/assemblyscript/Dockerfile.mustache

@@ -39,6 +39,5 @@ RUN ./node_modules/.bin/asc {{dir}}/wrap/entry.ts \
     --use abort={{dir}}/wrap/entry/wrapAbort \
     --optimize --importMemory \
     --runtime stub \
-    --runPasses asyncify \
-    --transform @serial-as/transform
+    --runPasses asyncify
 {{/polywrap_module}}

packages/js/client/src/__tests__/e2e/test-cases.ts

@@ -632,40 +632,68 @@ export const runJsonTypeTest = async (
   client: PolywrapClient,
   uri: string
 ) => {
-  const fromJson = await client.invoke<{ x: number; y: number }>({
+  type Json = string;
+  const value = JSON.stringify({ foo: "bar", bar: "bar" })
+  const parseResponse = await client.invoke<{ parse: Json }>({
     uri,
-    method: "fromJson",
+    method: "parse",
     input: {
-      json: JSON.stringify({ x: 1, y: 2 }),
-    },
-  });
+      value
+    }
+  })
 
-  expect(fromJson.error).toBeFalsy();
-  expect(fromJson.data).toBeTruthy();
-  expect(fromJson.data).toMatchObject({
-    x: 1,
-    y: 2,
-  });
+  expect(parseResponse.data).toEqual(value);
+
+  const values = [
+    JSON.stringify({ bar: "foo" }),
+    JSON.stringify({ baz: "fuz" }),
+  ];
 
-  const toJson = await client.invoke<{ str: string }>({
+  const stringifyResponse = await client.invoke<{ stringify: Json}>({
     uri,
-    method: "toJson",
+    method: "stringify",
     input: {
-      pair: {
-        x: 1,
-        y: 2,
-      },
+      values
+    }
+  })
+
+  expect(stringifyResponse.data).toEqual(values.join(""));
+
+  const object = {
+    jsonA: JSON.stringify({ foo: "bar" }),
+    jsonB: JSON.stringify({ fuz: "baz" }),
+  };
+
+  const stringifyObjectResponse = await client.invoke<{
+    stringifyObject: string;
+  }>({
+    uri,
+    method: "stringifyObject",
+    input: {
+      object,
     },
   });
 
-  expect(toJson.error).toBeFalsy();
-  expect(toJson.data).toBeTruthy();
-  expect(toJson.data).toBe(
-    JSON.stringify({
-      x: 1,
-      y: 2,
-    })
+  expect(stringifyObjectResponse.data).toEqual(
+    object.jsonA + object.jsonB
   );
+
+  const json = {
+    valueA: 5,
+    valueB: "foo",
+    valueC: true
+  }
+
+  const methodJSONResponse = await client.invoke<{
+    methodJSON: Json;
+  }>({
+    uri,
+    method: "methodJSON",
+    input: json
+  });
+
+  const methodJSONResult = JSON.stringify(json);
+  expect(methodJSONResponse.data).toEqual(methodJSONResult);
 };
 
 export const runLargeTypesTest = async (

packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/imported/object-type/index-ts.mustache

@@ -4,9 +4,7 @@ import {
   Nullable,
   BigInt,
   BigNumber,
-  JSON,
-  JSONSerializer,
-  JSONDeserializer,
+  JSON
 } from "@polywrap/wasm-as";
 import {
   serialize{{type}},
@@ -16,7 +14,6 @@ import {
 } from "./serialization";
 import * as Types from "../..";
 
-@serializable
 export class {{type}} {
 
   public static uri: string = "{{uri}}";
@@ -40,6 +37,4 @@ export class {{type}} {
   static read(reader: Read): {{type}} {
     return read{{type}}(reader);
   }
-
-  {{> json_methods}}
 }

packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/object-type/index-ts.mustache

@@ -4,9 +4,7 @@ import {
   Nullable,
   BigInt,
   BigNumber,
-  JSON,
-  JSONSerializer,
-  JSONDeserializer,
+  JSON
 } from "@polywrap/wasm-as";
 import {
   serialize{{type}},
@@ -16,7 +14,6 @@ import {
 } from "./serialization";
 import * as Types from "..";
 
-@serializable
 export class {{type}} {
   {{#properties}}
   {{#handleKeywords}}{{name}}{{/handleKeywords}}: {{#toWasm}}{{toGraphQLType}}{{/toWasm}};
@@ -37,6 +34,4 @@ export class {{type}} {
   static read(reader: Read): {{type}} {
     return read{{type}}(reader);
   }
-
-  {{> json_methods}}
 }

packages/test-cases/cases/bind/sanity/output/wasm-as/AnotherType/index.ts

@@ -4,9 +4,7 @@ import {
   Nullable,
   BigInt,
   BigNumber,
-  JSON,
-  JSONSerializer,
-  JSONDeserializer,
+  JSON
 } from "@polywrap/wasm-as";
 import {
   serializeAnotherType,
@@ -16,7 +14,6 @@ import {
 } from "./serialization";
 import * as Types from "..";
 
-@serializable
 export class AnotherType {
   prop: string | null;
   circular: Types.CustomType | null;
@@ -37,12 +34,4 @@ export class AnotherType {
   static read(reader: Read): AnotherType {
     return readAnotherType(reader);
   }
-
-  static toJson(type: AnotherType): JSON.Value {
-    return JSONSerializer.encode(type);
-  }
-
-  static fromJson(json: JSON.Value): AnotherType {
-    return (new JSONDeserializer(json)).decode<AnotherType>();
-  }
 }

packages/test-cases/cases/bind/sanity/output/wasm-as/CustomType/index.ts

@@ -4,9 +4,7 @@ import {
   Nullable,
   BigInt,
   BigNumber,
-  JSON,
-  JSONSerializer,
-  JSONDeserializer,
+  JSON
 } from "@polywrap/wasm-as";
 import {
   serializeCustomType,
@@ -16,7 +14,6 @@ import {
 } from "./serialization";
 import * as Types from "..";
 
-@serializable
 export class CustomType {
   str: string;
   optStr: string | null;
@@ -71,12 +68,4 @@ export class CustomType {
   static read(reader: Read): CustomType {
     return readCustomType(reader);
   }
-
-  static toJson(type: CustomType): JSON.Value {
-    return JSONSerializer.encode(type);
-  }
-
-  static fromJson(json: JSON.Value): CustomType {
-    return (new JSONDeserializer(json)).decode<CustomType>();
-  }
 }

packages/test-cases/cases/bind/sanity/output/wasm-as/Env/index.ts

@@ -4,9 +4,7 @@ import {
   Nullable,
   BigInt,
   BigNumber,
-  JSON,
-  JSONSerializer,
-  JSONDeserializer,
+  JSON
 } from "@polywrap/wasm-as";
 import {
   serializeEnv,
@@ -16,7 +14,6 @@ import {
 } from "./serialization";
 import * as Types from "..";
 
-@serializable
 export class Env {
   prop: string;
   optProp: string | null;
@@ -37,12 +34,4 @@ export class Env {
   static read(reader: Read): Env {
     return readEnv(reader);
   }
-
-  static toJson(type: Env): JSON.Value {
-    return JSONSerializer.encode(type);
-  }
-
-  static fromJson(json: JSON.Value): Env {
-    return (new JSONDeserializer(json)).decode<Env>();
-  }
 }

packages/test-cases/cases/bind/sanity/output/wasm-as/imported/TestImport_AnotherObject/index.ts

@@ -4,9 +4,7 @@ import {
   Nullable,
   BigInt,
   BigNumber,
-  JSON,
-  JSONSerializer,
-  JSONDeserializer,
+  JSON
 } from "@polywrap/wasm-as";
 import {
   serializeTestImport_AnotherObject,
@@ -16,7 +14,6 @@ import {
 } from "./serialization";
 import * as Types from "../..";
 
-@serializable
 export class TestImport_AnotherObject {
 
   public static uri: string = "testimport.uri.eth";
@@ -38,12 +35,4 @@ export class TestImport_AnotherObject {
   static read(reader: Read): TestImport_AnotherObject {
     return readTestImport_AnotherObject(reader);
   }
-
-  static toJson(type: TestImport_AnotherObject): JSON.Value {
-    return JSONSerializer.encode(type);
-  }
-
-  static fromJson(json: JSON.Value): TestImport_AnotherObject {
-    return (new JSONDeserializer(json)).decode<TestImport_AnotherObject>();
-  }
 }

packages/test-cases/cases/bind/sanity/output/wasm-as/imported/TestImport_Object/index.ts

@@ -4,9 +4,7 @@ import {
   Nullable,
   BigInt,
   BigNumber,
-  JSON,
-  JSONSerializer,
-  JSONDeserializer,
+  JSON
 } from "@polywrap/wasm-as";
 import {
   serializeTestImport_Object,
@@ -16,7 +14,6 @@ import {
 } from "./serialization";
 import * as Types from "../..";
 
-@serializable
 export class TestImport_Object {
 
   public static uri: string = "testimport.uri.eth";
@@ -45,12 +42,4 @@ export class TestImport_Object {
   static read(reader: Read): TestImport_Object {
     return readTestImport_Object(reader);
   }
-
-  static toJson(type: TestImport_Object): JSON.Value {
-    return JSONSerializer.encode(type);
-  }
-
-  static fromJson(json: JSON.Value): TestImport_Object {
-    return (new JSONDeserializer(json)).decode<TestImport_Object>();
-  }
 }

packages/test-cases/cases/wrappers/wasm-as/json-type/schema.graphql

@@ -1,9 +1,24 @@
 type Module {
-  fromJson(json: JSON!): Pair!
-  toJson(pair: Pair!): JSON!
-}
+  parse(
+    value: String!
+  ): JSON!
+
+  stringify(
+    values: [JSON!]!
+  ): String!
 
-type Pair {
-  x: Int!
-  y: Int!
+  stringifyObject(
+    object: Object!
+  ): String!
+
+  methodJSON(
+    valueA: Int!
+    valueB: String!
+    valueC: Boolean!
+  ): JSON!
 }
+
+type Object {
+  jsonA: JSON!
+  jsonB: JSON!
+}

packages/test-cases/cases/wrappers/wasm-as/json-type/src/index.ts

@@ -1,14 +1,36 @@
 import {
-  Input_fromJson,
-  Input_toJson,
-  Pair
+  Input_parse,
+  Input_stringify,
+  Input_stringifyObject,
+  Input_methodJSON
 } from "./wrap";
 import { JSON } from "@polywrap/wasm-as";
 
-export function fromJson(input: Input_fromJson): Pair {
-  return Pair.fromJson(input.json);
+export function parse(input: Input_parse): JSON.Value {
+  return JSON.parse(input.value);
 }
 
-export function toJson(input: Input_toJson): JSON.Value {
-  return Pair.toJson(input.pair);
+export function stringify(input: Input_stringify): string {
+  let str = "";
+  for (let i = 0; i < input.values.length; ++i) {
+    const value = input.values[i];
+    str += value.stringify();
+  }
+  return str;
 }
+
+export function stringifyObject(input: Input_stringifyObject): string {
+  let str = "";
+  str += input.object.jsonA.stringify();
+  str += input.object.jsonB.stringify();
+  return str;
+}
+
+export function methodJSON(input: Input_methodJSON): JSON.Value {
+  const result = JSON.Value.Object();
+  result.set("valueA", JSON.from(input.valueA));
+  result.set("valueB", JSON.from(input.valueB));
+  result.set("valueC", JSON.from(input.valueC));
+
+  return result;
+}