Support optional fields using question mark syntax

mtth · Jan 16, 2024 · 3cfd2bc · 3cfd2bc
1 parent 9330777
commit 3cfd2bc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/specs.js b/lib/specs.js
@@ -463,7 +463,9 @@ class Reader {
           delete schema.type; // Always overwrite the type.
           utils.copyOwnProperties(ref, schema);
         }
-        return Object.keys(schema).length > 1 ? schema : schema.type;
+        const isOptional = this._tk.next({id: 'operator', val: '?', silent: true});
+        const result = Object.keys(schema).length > 1 ? schema : schema.type;
+        return isOptional ? ['null', result]: result;
       }
     }
   }

diff --git a/test/test_specs.js b/test/test_specs.js
@@ -737,6 +737,12 @@ suite('specs', () => {
       );
     });
 
+    test('optional field', () => {
+      const usingQuestionMark = readSchema('record { int? optionalInt; }');
+      const usingUnion = readSchema('record { union{null,int} optionalInt; }');
+      assert.deepEqual(usingQuestionMark, usingUnion);
+    });
+
   });
 
   suite('readProtocol', () => {