Merge pull request #32 from typst-community/27-mutually-exclusive-cho…

…ices-in-either

Changes to `either` and `dictionary`

src/base-type.typ

@@ -111,6 +111,7 @@
       }
       ctx.outcome = display
       assert(ctx.soft-error, message: display)
+      return none
     },
   )
 }

src/schemas/author.typ

@@ -32,7 +32,7 @@
   ),
   pre-transform: coerce.dictionary(it => (name: it)),
   post-transform: (self, it) => {
-    if (it.at("email", default: none) != none and it.corresponding == none) {
+    if (it.at("email", default: none) != none and "corresponding" not in it) {
       it.insert("corresponding", true)
     }
     return it

src/types/dictionary.typ

@@ -46,6 +46,22 @@
         return none
       }
 
+      // Check `it` if strict
+      if (ctx.strict == true) {
+        for (key, value) in it {
+          if (key not in self.dictionary-schema) {
+            return (self.fail-validation)(
+              self,
+              it,
+              ctx: ctx,
+              scope: scope,
+              message: "Unknown key `" + key + "` in dictionary",
+            )
+          }
+        }
+      }
+
+
       for (key, schema) in self.dictionary-schema {
 
         let entry = (
@@ -57,17 +73,8 @@
           scope: (..scope, str(key))
         )
 
-        it.insert(key, entry)
-
-        if (
-          entry == none and (
-            it.at(
-              key,
-              default: none,
-            ) != none or ctx.remove-optional-none == true
-          )
-        ) {
-          it.remove(key, default: none)
+        if (entry != none) {
+          it.insert(key, entry)
         }
 
       }

src/types/logical.typ

@@ -5,24 +5,29 @@
 /// Valkyrie schema generator for objects that can be any of multiple types.
 ///
 /// -> schema
-#let either(..args) = {
+#let either(
+  strict: false,
+  ..args,
+) = {
 
   assert(
     args.pos().len() > 0,
     message: "z.either requires 1 or more arguments.",
   )
   assert-base-type-array(args.pos(), scope: ("arguments",))
 
-  base-type() + (
+  base-type(
     name: "[" + args.pos().map(it => it.name).join(", ", last: " or ") + "]",
     ..args.named(),
+  ) + (
+    strict: strict,
     options: args.pos(),
     handle-descendents: (self, it, ctx: z-ctx(), scope: ()) => {
       for option in self.options {
         let ret = (option.validate)(
           option,
           it,
-          ctx: z-ctx(ctx, soft-error: true),
+          ctx: z-ctx(ctx, strict: self.strict, soft-error: true),
           scope: scope,
         )
         if ret != none {
@@ -37,7 +42,13 @@
         ) + ". Got " + type(it)
       )
 
-      (self.fail-validation)(self, it, ctx: ctx, scope: scope, message: message)
+      return (self.fail-validation)(
+        self,
+        it,
+        ctx: ctx,
+        scope: scope,
+        message: message,
+      )
     },
   )
 }

tests/logical/test.typ

@@ -3,11 +3,10 @@
 
 #show: show-rule.with();
 
-#let schema = z.either(z.email(), z.ip())
-
 = logical/either
 == Input types
 #{
+  let schema = z.either(z.email(), z.ip())
   let input-types = (
     "ip (1.1.1.1)": "1.1.1.1",
     "email": "[email protected]",
@@ -20,4 +19,21 @@
       truth: value,
     )([It should validate #name])
   }
+}
+
+#{
+  let schema = z.either(
+    strict: true,
+    z.dictionary((
+      seed: z.integer(),
+    )),
+    z.dictionary((
+      dynamic: z.boolean(),
+    )),
+  )
+
+  z.parse(
+    (dynamic: false),
+    schema,
+  )
 }

tests/schemas/author/test.typ

@@ -12,7 +12,9 @@
     (
       name: "James R Swift",
       email: "hello@world.com",
+      // test: true,
     ),
     z.schemas.author,
+    ctx: z.z-ctx(strict: true),
   )
 ]

tests/types/string/test.typ

@@ -47,9 +47,9 @@
 #z.parse("192.168.0.1", z.ip())
 
 == default
-#let _ = z.parse(none, z.string(default: "Hello")) 
+#let _ = z.parse(none, z.string(default: "Hello"))
 #let _ = z.parse(auto, z.string(default: "Hello"))
 #let _ = z.parse(auto, z.string(default: "Hello", optional: true))
 #let _ = repr(z.parse(auto, z.string(optional: true)))
-// #z.parse(auto, z.string()) \ 
+// #z.parse(auto, z.string()) \
 #let _ = z.parse("none", z.string(default: "Hello"))

tests/types/tuple/test.typ

@@ -2,7 +2,11 @@
 #set page(height: 1cm, width: 1cm)
 
 #{
-  let test-tuple = ("123", "[email protected]", 1.1)
+  let test-tuple = (
+    "123",
+    "[email protected]",
+    // 1.1
+    )
 
   z.parse(
     test-tuple,