Merge pull request #944 from polywrap/809-option-type

Replace Nullable with Option in assemblyscript
polywrap · Jun 23, 2022 · 2574720 · 2574720
2 parents c5fb839 + dcc9edd
commit 2574720
Show file tree

Hide file tree

Showing 31 changed files with 244 additions and 317 deletions.
diff --git a/packages/schema/bind/src/bindings/assemblyscript/wasm-as/functions.ts b/packages/schema/bind/src/bindings/assemblyscript/wasm-as/functions.ts
@@ -50,13 +50,14 @@ export const toWasmInit: MustacheFn = () => {
       type = type.substring(0, type.length - 1);
     } else {
       const nullType = toWasm()(value, render);
-      const nullable = "Nullable";
+      const nullable = "Option";
       const nullOptional = "| null";
 
       if (nullType.endsWith(nullOptional)) {
         return "null";
       } else if (nullType.startsWith(nullable)) {
-        return `new ${nullType}()`;
+        type = nullType.substring(6);
+        return `Option.None${type}()`;
       }
     }
 
@@ -227,7 +228,7 @@ const applyNullable = (
     ) {
       return `${type} | null`;
     } else {
-      return `Nullable<${type}>`;
+      return `Option<${type}>`;
     }
   } else {
     return type;

diff --git a/packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/deserialize_enum.mustache b/packages/schema/bind/src/bindings/assemblyscript/wasm-as/templates/deserialize_enum.mustache
@@ -8,19 +8,19 @@ if (reader.isNextString()) {
 }
 {{/required}}
 {{^required}}
-let value: Nullable<Types.{{type}}>;
+let value: Option<Types.{{type}}>;
 if (!reader.isNextNil()) {
   if (reader.isNextString()) {
-    value = Nullable.fromValue(
+    value = Option.Some(
       Types.get{{type}}Value(reader.readString())
     );
   } else {
-    value = Nullable.fromValue(
+    value = Option.Some(
       reader.readInt32()
     );
-    Types.sanitize{{type}}Value(value.value);
+    Types.sanitize{{type}}Value(value.unwrap());
   }
 } else {
-  value = Nullable.fromNull<Types.{{type}}>();
+  value = Option.None<Types.{{type}}>();
 }
 {{/required}}
diff --git a/...bind/src/bindings/assemblyscript/wasm-as/templates/imported/module-type/index-ts.mustache b/...bind/src/bindings/assemblyscript/wasm-as/templates/imported/module-type/index-ts.mustache
@@ -1,7 +1,7 @@
 import {
   wrap_subinvoke,
   wrap_subinvokeImplementation,
-  Nullable,
+  Option,
   BigInt,
   BigNumber,
   JSON,

diff --git a/.../bindings/assemblyscript/wasm-as/templates/imported/module-type/serialization-ts.mustache b/.../bindings/assemblyscript/wasm-as/templates/imported/module-type/serialization-ts.mustache
@@ -70,7 +70,7 @@ export function write{{name}}Args(
 }
 
 export function deserialize{{name}}Result(buffer: ArrayBuffer): {{#return}}{{#toWasm}}{{toGraphQLType}}{{/toWasm}}{{/return}} {
-  const context: Context =  new Context("Deserializing imported module-type: {{name}}");
+  const context: Context = new Context("Deserializing imported module-type: {{name}}");
   const reader = new ReadDecoder(buffer, context);
 
   {{#return}}

diff --git a/...bind/src/bindings/assemblyscript/wasm-as/templates/imported/object-type/index-ts.mustache b/...bind/src/bindings/assemblyscript/wasm-as/templates/imported/object-type/index-ts.mustache
@@ -1,7 +1,7 @@
 import {
   Read,
   Write,
-  Nullable,
+  Option,
   BigInt,
   BigNumber,
   JSON

diff --git a/.../bind/src/bindings/assemblyscript/wasm-as/templates/module-type/serialization-ts.mustache b/.../bind/src/bindings/assemblyscript/wasm-as/templates/module-type/serialization-ts.mustache
@@ -9,7 +9,7 @@ export class Input_{{name}} {
 }
 
 export function deserialize{{name}}Args(argsBuf: ArrayBuffer): Input_{{name}} {
-  const context: Context =  new Context("Deserializing module-type: {{name}}");
+  const context: Context = new Context("Deserializing module-type: {{name}}");
   {{#arguments.length}}
   const reader = new ReadDecoder(argsBuf, context);
   let numFields = reader.readMapLength();

diff --git a/...s/schema/bind/src/bindings/assemblyscript/wasm-as/templates/object-type/index-ts.mustache b/...s/schema/bind/src/bindings/assemblyscript/wasm-as/templates/object-type/index-ts.mustache
@@ -1,7 +1,7 @@
 import {
   Read,
   Write,
-  Nullable,
+  Option,
   BigInt,
   BigNumber,
   JSON

diff --git a/.../schema/bind/src/bindings/assemblyscript/wasm-as/templates/serialization_imports.mustache b/.../schema/bind/src/bindings/assemblyscript/wasm-as/templates/serialization_imports.mustache
@@ -4,7 +4,7 @@ import {
   Write,
   WriteSizer,
   WriteEncoder,
-  Nullable,
+  Option,
   BigInt,
   BigNumber,
   JSON,

diff --git a/packages/test-cases/cases/bind/sanity/output/wasm-as/AnotherType/index.ts b/packages/test-cases/cases/bind/sanity/output/wasm-as/AnotherType/index.ts
@@ -1,7 +1,7 @@
 import {
   Read,
   Write,
-  Nullable,
+  Option,
   BigInt,
   BigNumber,
   JSON

diff --git a/packages/test-cases/cases/bind/sanity/output/wasm-as/AnotherType/serialization.ts b/packages/test-cases/cases/bind/sanity/output/wasm-as/AnotherType/serialization.ts
@@ -4,7 +4,7 @@ import {
   Write,
   WriteSizer,
   WriteEncoder,
-  Nullable,
+  Option,
   BigInt,
   BigNumber,
   JSON,

diff --git a/packages/test-cases/cases/bind/sanity/output/wasm-as/CustomType/index.ts b/packages/test-cases/cases/bind/sanity/output/wasm-as/CustomType/index.ts
@@ -1,7 +1,7 @@
 import {
   Read,
   Write,
-  Nullable,
+  Option,
   BigInt,
   BigNumber,
   JSON
@@ -18,7 +18,7 @@ export class CustomType {
   str: string;
   optStr: string | null;
   u: u32;
-  optU: Nullable<u32>;
+  optU: Option<u32>;
   m_u8: u8;
   m_u16: u16;
   m_u32: u32;
@@ -35,23 +35,23 @@ export class CustomType {
   bytes: ArrayBuffer;
   optBytes: ArrayBuffer | null;
   m_boolean: bool;
-  optBoolean: Nullable<bool>;
+  optBoolean: Option<bool>;
   uArray: Array<u32>;
   uOptArray: Array<u32> | null;
-  optUOptArray: Array<Nullable<u32>> | null;
+  optUOptArray: Array<Option<u32>> | null;
   optStrOptArray: Array<string | null> | null;
   uArrayArray: Array<Array<u32>>;
-  uOptArrayOptArray: Array<Array<Nullable<u32>> | null>;
+  uOptArrayOptArray: Array<Array<Option<u32>> | null>;
   uArrayOptArrayArray: Array<Array<Array<u32>> | null>;
   crazyArray: Array<Array<Array<Array<u32> | null>> | null> | null;
   object: Types.AnotherType;
   optObject: Types.AnotherType | null;
   objectArray: Array<Types.AnotherType>;
   optObjectArray: Array<Types.AnotherType | null> | null;
   en: Types.CustomEnum;
-  optEnum: Nullable<Types.CustomEnum>;
+  optEnum: Option<Types.CustomEnum>;
   enumArray: Array<Types.CustomEnum>;
-  optEnumArray: Array<Nullable<Types.CustomEnum>> | null;
+  optEnumArray: Array<Option<Types.CustomEnum>> | null;
 
   static toBuffer(type: CustomType): ArrayBuffer {
     return serializeCustomType(type);

diff --git a/packages/test-cases/cases/bind/sanity/output/wasm-as/CustomType/serialization.ts b/packages/test-cases/cases/bind/sanity/output/wasm-as/CustomType/serialization.ts
@@ -4,7 +4,7 @@ import {
   Write,
   WriteSizer,
   WriteEncoder,
-  Nullable,
+  Option,
   BigInt,
   BigNumber,
   JSON,
@@ -38,7 +38,7 @@ export function writeCustomType(writer: Write, type: CustomType): void {
   writer.writeString("u");
   writer.writeUInt32(type.u);
   writer.context().pop();
-  writer.context().push("optU", "Nullable<u32>", "writing property");
+  writer.context().push("optU", "Option<u32>", "writing property");
   writer.writeString("optU");
   writer.writeNullableUInt32(type.optU);
   writer.context().pop();
@@ -106,7 +106,7 @@ export function writeCustomType(writer: Write, type: CustomType): void {
   writer.writeString("boolean");
   writer.writeBool(type.m_boolean);
   writer.context().pop();
-  writer.context().push("optBoolean", "Nullable<bool>", "writing property");
+  writer.context().push("optBoolean", "Option<bool>", "writing property");
   writer.writeString("optBoolean");
   writer.writeNullableBool(type.optBoolean);
   writer.context().pop();
@@ -122,9 +122,9 @@ export function writeCustomType(writer: Write, type: CustomType): void {
     writer.writeUInt32(item);
   });
   writer.context().pop();
-  writer.context().push("optUOptArray", "Array<Nullable<u32>> | null", "writing property");
+  writer.context().push("optUOptArray", "Array<Option<u32>> | null", "writing property");
   writer.writeString("optUOptArray");
-  writer.writeNullableArray(type.optUOptArray, (writer: Write, item: Nullable<u32>): void => {
+  writer.writeNullableArray(type.optUOptArray, (writer: Write, item: Option<u32>): void => {
     writer.writeNullableUInt32(item);
   });
   writer.context().pop();
@@ -142,10 +142,10 @@ export function writeCustomType(writer: Write, type: CustomType): void {
     });
   });
   writer.context().pop();
-  writer.context().push("uOptArrayOptArray", "Array<Array<Nullable<u32>> | null>", "writing property");
+  writer.context().push("uOptArrayOptArray", "Array<Array<Option<u32>> | null>", "writing property");
   writer.writeString("uOptArrayOptArray");
-  writer.writeArray(type.uOptArrayOptArray, (writer: Write, item: Array<Nullable<u32>> | null): void => {
-    writer.writeNullableArray(item, (writer: Write, item: Nullable<u32>): void => {
+  writer.writeArray(type.uOptArrayOptArray, (writer: Write, item: Array<Option<u32>> | null): void => {
+    writer.writeNullableArray(item, (writer: Write, item: Option<u32>): void => {
       writer.writeNullableUInt32(item);
     });
   });
@@ -204,7 +204,7 @@ export function writeCustomType(writer: Write, type: CustomType): void {
   writer.writeString("en");
   writer.writeInt32(type.en);
   writer.context().pop();
-  writer.context().push("optEnum", "Nullable<Types.CustomEnum>", "writing property");
+  writer.context().push("optEnum", "Option<Types.CustomEnum>", "writing property");
   writer.writeString("optEnum");
   writer.writeNullableInt32(type.optEnum);
   writer.context().pop();
@@ -214,9 +214,9 @@ export function writeCustomType(writer: Write, type: CustomType): void {
     writer.writeInt32(item);
   });
   writer.context().pop();
-  writer.context().push("optEnumArray", "Array<Nullable<Types.CustomEnum>> | null", "writing property");
+  writer.context().push("optEnumArray", "Array<Option<Types.CustomEnum>> | null", "writing property");
   writer.writeString("optEnumArray");
-  writer.writeNullableArray(type.optEnumArray, (writer: Write, item: Nullable<Types.CustomEnum>): void => {
+  writer.writeNullableArray(type.optEnumArray, (writer: Write, item: Option<Types.CustomEnum>): void => {
     writer.writeNullableInt32(item);
   });
   writer.context().pop();
@@ -236,7 +236,7 @@ export function readCustomType(reader: Read): CustomType {
   let _optStr: string | null = null;
   let _u: u32 = 0;
   let _uSet: bool = false;
-  let _optU: Nullable<u32> = new Nullable<u32>();
+  let _optU: Option<u32> = Option.None<u32>();
   let _u8: u8 = 0;
   let _u8Set: bool = false;
   let _u16: u16 = 0;
@@ -265,15 +265,15 @@ export function readCustomType(reader: Read): CustomType {
   let _optBytes: ArrayBuffer | null = null;
   let _boolean: bool = false;
   let _booleanSet: bool = false;
-  let _optBoolean: Nullable<bool> = new Nullable<bool>();
+  let _optBoolean: Option<bool> = Option.None<bool>();
   let _uArray: Array<u32> = [];
   let _uArraySet: bool = false;
   let _uOptArray: Array<u32> | null = null;
-  let _optUOptArray: Array<Nullable<u32>> | null = null;
+  let _optUOptArray: Array<Option<u32>> | null = null;
   let _optStrOptArray: Array<string | null> | null = null;
   let _uArrayArray: Array<Array<u32>> = [];
   let _uArrayArraySet: bool = false;
-  let _uOptArrayOptArray: Array<Array<Nullable<u32>> | null> = [];
+  let _uOptArrayOptArray: Array<Array<Option<u32>> | null> = [];
   let _uOptArrayOptArraySet: bool = false;
   let _uArrayOptArrayArray: Array<Array<Array<u32>> | null> = [];
   let _uArrayOptArrayArraySet: bool = false;
@@ -286,10 +286,10 @@ export function readCustomType(reader: Read): CustomType {
   let _optObjectArray: Array<Types.AnotherType | null> | null = null;
   let _en: Types.CustomEnum = 0;
   let _enSet: bool = false;
-  let _optEnum: Nullable<Types.CustomEnum> = new Nullable<Types.CustomEnum>();
+  let _optEnum: Option<Types.CustomEnum> = Option.None<Types.CustomEnum>();
   let _enumArray: Array<Types.CustomEnum> = [];
   let _enumArraySet: bool = false;
-  let _optEnumArray: Array<Nullable<Types.CustomEnum>> | null = null;
+  let _optEnumArray: Array<Option<Types.CustomEnum>> | null = null;
 
   while (numFields > 0) {
     numFields--;
@@ -314,7 +314,7 @@ export function readCustomType(reader: Read): CustomType {
       reader.context().pop();
     }
     else if (field == "optU") {
-      reader.context().push(field, "Nullable<u32>", "type found, reading property");
+      reader.context().push(field, "Option<u32>", "type found, reading property");
       _optU = reader.readNullableUInt32();
       reader.context().pop();
     }
@@ -411,7 +411,7 @@ export function readCustomType(reader: Read): CustomType {
       reader.context().pop();
     }
     else if (field == "optBoolean") {
-      reader.context().push(field, "Nullable<bool>", "type found, reading property");
+      reader.context().push(field, "Option<bool>", "type found, reading property");
       _optBoolean = reader.readNullableBool();
       reader.context().pop();
     }
@@ -431,8 +431,8 @@ export function readCustomType(reader: Read): CustomType {
       reader.context().pop();
     }
     else if (field == "optUOptArray") {
-      reader.context().push(field, "Array<Nullable<u32>> | null", "type found, reading property");
-      _optUOptArray = reader.readNullableArray((reader: Read): Nullable<u32> => {
+      reader.context().push(field, "Array<Option<u32>> | null", "type found, reading property");
+      _optUOptArray = reader.readNullableArray((reader: Read): Option<u32> => {
         return reader.readNullableUInt32();
       });
       reader.context().pop();
@@ -455,9 +455,9 @@ export function readCustomType(reader: Read): CustomType {
       reader.context().pop();
     }
     else if (field == "uOptArrayOptArray") {
-      reader.context().push(field, "Array<Array<Nullable<u32>> | null>", "type found, reading property");
-      _uOptArrayOptArray = reader.readArray((reader: Read): Array<Nullable<u32>> | null => {
-        return reader.readNullableArray((reader: Read): Nullable<u32> => {
+      reader.context().push(field, "Array<Array<Option<u32>> | null>", "type found, reading property");
+      _uOptArrayOptArray = reader.readArray((reader: Read): Array<Option<u32>> | null => {
+        return reader.readNullableArray((reader: Read): Option<u32> => {
           return reader.readNullableUInt32();
         });
       });
@@ -539,21 +539,21 @@ export function readCustomType(reader: Read): CustomType {
       reader.context().pop();
     }
     else if (field == "optEnum") {
-      reader.context().push(field, "Nullable<Types.CustomEnum>", "type found, reading property");
-      let value: Nullable<Types.CustomEnum>;
+      reader.context().push(field, "Option<Types.CustomEnum>", "type found, reading property");
+      let value: Option<Types.CustomEnum>;
       if (!reader.isNextNil()) {
         if (reader.isNextString()) {
-          value = Nullable.fromValue(
+          value = Option.Some(
             Types.getCustomEnumValue(reader.readString())
           );
         } else {
-          value = Nullable.fromValue(
+          value = Option.Some(
             reader.readInt32()
           );
-          Types.sanitizeCustomEnumValue(value.value);
+          Types.sanitizeCustomEnumValue(value.unwrap());
         }
       } else {
-        value = Nullable.fromNull<Types.CustomEnum>();
+        value = Option.None<Types.CustomEnum>();
       }
       _optEnum = value;
       reader.context().pop();
@@ -574,22 +574,22 @@ export function readCustomType(reader: Read): CustomType {
       reader.context().pop();
     }
     else if (field == "optEnumArray") {
-      reader.context().push(field, "Array<Nullable<Types.CustomEnum>> | null", "type found, reading property");
-      _optEnumArray = reader.readNullableArray((reader: Read): Nullable<Types.CustomEnum> => {
-        let value: Nullable<Types.CustomEnum>;
+      reader.context().push(field, "Array<Option<Types.CustomEnum>> | null", "type found, reading property");
+      _optEnumArray = reader.readNullableArray((reader: Read): Option<Types.CustomEnum> => {
+        let value: Option<Types.CustomEnum>;
         if (!reader.isNextNil()) {
           if (reader.isNextString()) {
-            value = Nullable.fromValue(
+            value = Option.Some(
               Types.getCustomEnumValue(reader.readString())
             );
           } else {
-            value = Nullable.fromValue(
+            value = Option.Some(
               reader.readInt32()
             );
-            Types.sanitizeCustomEnumValue(value.value);
+            Types.sanitizeCustomEnumValue(value.unwrap());
           }
         } else {
-          value = Nullable.fromNull<Types.CustomEnum>();
+          value = Option.None<Types.CustomEnum>();
         }
         return value;
       });