@ghentcdh/crouton-api 0.0.1-alpha.71 → 0.0.1-alpha.74

package/dist/index.cjs

@@ -878,14 +878,18 @@ var ColumnTypeShorthandSchema = import_zod11.z.enum([
 var JsonSchemaFragmentSchema = import_zod11.z.lazy(() => import_zod11.z.object({
   type: import_zod11.z.union([
     import_zod11.z.string(),
-    import_zod11.z.array(import_zod11.z.string())
+    import_zod11.z.array(import_zod11.z.string()),
+    import_zod11.z.lazy(() => JsonSchemaFragmentSchema)
   ]).optional(),
   format: import_zod11.z.string().optional(),
   enum: import_zod11.z.array(import_zod11.z.unknown()).optional(),
   const: import_zod11.z.unknown().optional(),
   nullable: import_zod11.z.boolean().optional(),
   properties: import_zod11.z.record(import_zod11.z.string(), JsonSchemaFragmentSchema).optional(),
-  required: import_zod11.z.array(import_zod11.z.string()).optional(),
+  required: import_zod11.z.union([
+    import_zod11.z.array(import_zod11.z.string()),
+    import_zod11.z.boolean()
+  ]).optional(),
   items: JsonSchemaFragmentSchema.optional(),
   additionalProperties: import_zod11.z.union([
     import_zod11.z.boolean(),
@@ -948,11 +952,33 @@ var normalizeFragment = /* @__PURE__ */ __name((fragment) => {
       if (out.format === void 0) out.format = expanded.format;
     }
   }
+  if (out.type && typeof out.type === "object" && !Array.isArray(out.type)) {
+    Object.assign(out, out.type);
+  }
   if (out.properties) {
-    out.properties = Object.fromEntries(Object.entries(out.properties).map(([key, value]) => [
-      key,
-      normalizeFragment(value)
-    ]));
+    const existingRequired = Array.isArray(out.required) ? out.required : [];
+    const hoistedRequired = [
+      ...existingRequired
+    ];
+    out.properties = Object.fromEntries(Object.entries(out.properties).map(([key, value]) => {
+      let v = {
+        ...value
+      };
+      if (v.required === true) {
+        hoistedRequired.push(key);
+        const { required: _r, ...rest } = v;
+        v = rest;
+      }
+      return [
+        key,
+        normalizeFragment(v)
+      ];
+    }));
+    if (hoistedRequired.length > 0) {
+      out.required = hoistedRequired;
+    } else {
+      delete out.required;
+    }
   }
   if (out.items) out.items = normalizeFragment(out.items);
   if (out.additionalProperties && typeof out.additionalProperties === "object") {