v7.1.0 🚀 - Use enum field for union of literals

Author: DZakh

README.md

@@ -78,12 +78,7 @@ JSONSchema.make(filmSchema)
     "Title": { "type": "string" },
     "Tags": { "items": { "type": "string" }, "type": "array", "default": [] },
     "Rating": {
-      "anyOf": [
-        { "type": "string", "const": "G" },
-        { "type": "string", "const": "PG" },
-        { "type": "string", "const": "PG13" },
-        { "type": "string", "const": "R" }
-      ]
+      "enum": ["G", "PG", "PG13", "R"]
     },
     "Age": {
       "type": "integer",

__tests__/JSONSchema_test.res

@@ -413,8 +413,22 @@ test("Schema of tuple schema", t => {
   )
 })
 
+test("Schema of enum schema", t => {
+  let schema = S.enum(["Yes", "No"])
+
+  t->Assert.deepEqual(
+    JSONSchema.make(schema),
+    Ok(
+      %raw(`{
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "enum": ["Yes", "No"]
+      }`),
+    ),
+  )
+})
+
 test("Schema of union schema", t => {
-  let schema = S.union([S.literal("Yes"), S.literal("No")])
+  let schema = S.union([S.literal("Yes"), S.string])
 
   t->Assert.deepEqual(
     JSONSchema.make(schema),
@@ -427,7 +441,6 @@ test("Schema of union schema", t => {
             type: 'string'
           },
           {
-            const: 'No',
             type: 'string'
           }
         ]
@@ -990,12 +1003,7 @@ module Example = {
             Title: { type: "string" },
             Tags: { items: { type: "string" }, type: "array", default: [] },
             Rating: {
-              anyOf: [
-                { type: "string", const: "G" },
-                { type: "string", const: "PG" },
-                { type: "string", const: "PG13" },
-                { type: "string", const: "R" },
-              ],
+              enum: ["G", "PG", "PG13", "R"],
             },
             Age: {
               type: "integer",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "rescript-json-schema",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "description": "📄 Typesafe JSON Schema for ReScript",
   "keywords": [
     "rescript",
@@ -42,7 +42,7 @@
     "@dzakh/rescript-ava": "3.0.0",
     "ava": "5.2.0",
     "rescript": "11.1.4",
-    "rescript-schema": "9.0.1",
+    "rescript-schema": "9.1.0",
     "c8": "8.0.1"
   },
   "peerDependencies": {

package.json

@@ -165,14 +165,27 @@ let rec fromRescriptSchema:
       }
 
     | S.Union(childSchemas) => {
-        let items = childSchemas->Js.Array2.map(childSchema => {
+        let literals = []
+        let items = []
+
+        childSchemas->Js.Array2.forEach(childSchema => {
           if childSchema->isOptionalSchema {
             Error.UnsupportedOptionalItem.raise(schema)
-          } else {
-            Definition.schema(fromRescriptSchema(childSchema))
+          }
+
+          items->Js.Array2.push(Definition.schema(fromRescriptSchema(childSchema)))->ignore
+          switch childSchema->S.classify {
+          | Literal(l) =>
+            literals->Js.Array2.push(l->S.Literal.value->(magic: unknown => Js.Json.t))->ignore
+          | _ => ()
           }
         })
-        jsonSchema.anyOf = Some(items)
+
+        if literals->Js.Array2.length === items->Js.Array2.length {
+          jsonSchema.enum = Some(literals)
+        } else {
+          jsonSchema.anyOf = Some(items)
+        }
       }
 
     | S.Option(childSchema) => {