@openframe-org/criteria-set-protocol 3.0.0-alpha.9 → 3.0.0-beta.2

package/dist/v1/schemas/common.d.ts

@@ -6,7 +6,7 @@ export declare const colorSchema: z.ZodUnion<readonly [z.ZodString, z.ZodObject<
 }, z.core.$strip>]>;
 export declare const taskItemScalarValueSchema: z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodNull]>;
 export declare const taskItemValueSchema: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodNull]>, z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodNull]>>]>;
-export declare const elementDataSchema: z.ZodUnion<[z.ZodUnion<[z.ZodObject<{
+export declare const elementDataSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     value: z.ZodNullable<z.ZodNumber>;
     maximumValue: z.ZodNullable<z.ZodNumber>;
     minimumValue: z.ZodNullable<z.ZodNumber>;
@@ -20,14 +20,14 @@ export declare const elementDataSchema: z.ZodUnion<[z.ZodUnion<[z.ZodObject<{
     weight: z.ZodNullable<z.ZodNumber>;
     type: z.ZodLiteral<"percentage">;
     total: z.ZodOptional<z.ZodNever>;
-}, z.core.$catchall<z.ZodAny>>]>, z.ZodObject<{
+}, z.core.$catchall<z.ZodAny>>, z.ZodObject<{
     type: z.ZodLiteral<"boolean">;
     value: z.ZodNullable<z.ZodBoolean>;
     total: z.ZodOptional<z.ZodNever>;
     maximumValue: z.ZodOptional<z.ZodNever>;
     minimumValue: z.ZodOptional<z.ZodNever>;
     weight: z.ZodOptional<z.ZodNever>;
-}, z.core.$catchall<z.ZodAny>>]>;
+}, z.core.$catchall<z.ZodAny>>], "type">;
 export declare const criteriaTreeElementTypeSchema: z.ZodEnum<{
     theme: "theme";
     criterion: "criterion";
@@ -62,7 +62,7 @@ export declare const abstractElementSchema: z.ZodObject<{
         type: z.ZodLiteral<"link">;
         url: z.ZodString;
     }, z.core.$strip>], "type">>>;
-    data: z.ZodNullable<z.ZodUnion<[z.ZodUnion<[z.ZodObject<{
+    data: z.ZodNullable<z.ZodDiscriminatedUnion<[z.ZodObject<{
         value: z.ZodNullable<z.ZodNumber>;
         maximumValue: z.ZodNullable<z.ZodNumber>;
         minimumValue: z.ZodNullable<z.ZodNumber>;
@@ -76,28 +76,28 @@ export declare const abstractElementSchema: z.ZodObject<{
         weight: z.ZodNullable<z.ZodNumber>;
         type: z.ZodLiteral<"percentage">;
         total: z.ZodOptional<z.ZodNever>;
-    }, z.core.$catchall<z.ZodAny>>]>, z.ZodObject<{
+    }, z.core.$catchall<z.ZodAny>>, z.ZodObject<{
         type: z.ZodLiteral<"boolean">;
         value: z.ZodNullable<z.ZodBoolean>;
         total: z.ZodOptional<z.ZodNever>;
         maximumValue: z.ZodOptional<z.ZodNever>;
         minimumValue: z.ZodOptional<z.ZodNever>;
         weight: z.ZodOptional<z.ZodNever>;
-    }, z.core.$catchall<z.ZodAny>>]>>;
+    }, z.core.$catchall<z.ZodAny>>], "type">>;
     sortOrder: z.ZodNullable<z.ZodNumber>;
 }, z.core.$strip>;
 export declare const breadcrumbOptionsSchema: z.ZodUnion<[z.ZodObject<{
     hideFromBreadcrumbs: z.ZodLiteral<true>;
     breadcrumbTextFormat: z.ZodOptional<z.ZodNever>;
 }, z.core.$strip>, z.ZodObject<{
-    hideFromBreadcrumbs: z.ZodDefault<z.ZodNullable<z.ZodLiteral<false>>>;
+    hideFromBreadcrumbs: z.ZodDefault<z.ZodLiteral<false>>;
     breadcrumbTextFormat: z.ZodString;
 }, z.core.$strip>]>;
 export declare const documentTreeOptionsSchema: z.ZodUnion<[z.ZodObject<{
     hideFromDocumentTree: z.ZodLiteral<true>;
     documentTreeFolderTextFormat: z.ZodOptional<z.ZodNever>;
 }, z.core.$strip>, z.ZodObject<{
-    hideFromDocumentTree: z.ZodNullable<z.ZodLiteral<false>>;
+    hideFromDocumentTree: z.ZodLiteral<false>;
     documentTreeFolderTextFormat: z.ZodString;
 }, z.core.$strip>]>;
 export declare const criteriaTreeOptionsSchema: z.ZodObject<{
@@ -106,7 +106,7 @@ export declare const criteriaTreeOptionsSchema: z.ZodObject<{
 export declare const reportOptionsSchema: z.ZodObject<{
     reportTitleTextFormat: z.ZodString;
 }, z.core.$strip>;
-export declare const treeResultSchema: z.ZodUnion<[z.ZodUnion<[z.ZodObject<{
+export declare const treeResultSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     type: z.ZodLiteral<"number">;
     total: z.ZodNullable<z.ZodNumber>;
     value: z.ZodNullable<z.ZodNumber>;
@@ -114,11 +114,11 @@ export declare const treeResultSchema: z.ZodUnion<[z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"percentage">;
     total: z.ZodOptional<z.ZodNever>;
     value: z.ZodNullable<z.ZodNumber>;
-}, z.core.$catchall<z.ZodAny>>]>, z.ZodObject<{
+}, z.core.$catchall<z.ZodAny>>, z.ZodObject<{
     type: z.ZodLiteral<"boolean">;
     value: z.ZodNullable<z.ZodBoolean>;
     total: z.ZodOptional<z.ZodNever>;
     maximumValue: z.ZodOptional<z.ZodNever>;
     minimumValue: z.ZodOptional<z.ZodNever>;
     weight: z.ZodOptional<z.ZodNever>;
-}, z.core.$catchall<z.ZodAny>>]>;
+}, z.core.$catchall<z.ZodAny>>], "type">;

package/dist/v1/schemas/common.js

@@ -20,9 +20,7 @@ exports.taskItemScalarValueSchema = zod_1.z
 exports.taskItemValueSchema = zod_1.z
     .union([exports.taskItemScalarValueSchema, zod_1.z.array(exports.taskItemScalarValueSchema)])
     .describe("TaskItemValue - Can be either a scalar value or an array of scalar values");
-const abstractElementDataSchema = zod_1.z.object({
-    type: zod_1.z.enum(["number", "percentage", "boolean"])
-}).catchall(zod_1.z.any());
+const abstractElementDataSchema = zod_1.z.object().catchall(zod_1.z.any());
 const abstractNumberElementDataSchema = abstractElementDataSchema.extend({
     value: zod_1.z.number().nullable().describe("Value of the element"),
     maximumValue: zod_1.z
@@ -40,21 +38,25 @@ const numberElementDataSchema = abstractNumberElementDataSchema.extend({
     total: zod_1.z
         .number()
         .nullable()
-        .describe("Total value, understood as 'value'/'total'"),
-});
+        .describe("Total value, understood as 'value'/'total'")
+}).catchall(zod_1.z.any());
 const percentageElementDataSchema = abstractNumberElementDataSchema.extend({
     type: zod_1.z.literal("percentage").describe("Type of data"),
     total: zod_1.z.never().optional()
-});
+}).catchall(zod_1.z.any());
 const booleanElementDataSchema = abstractElementDataSchema.extend({
     type: zod_1.z.literal("boolean").describe("Type of data"),
     value: zod_1.z.boolean().nullable().describe("Value of the element"),
     total: zod_1.z.never().optional(),
     maximumValue: zod_1.z.never().optional(),
     minimumValue: zod_1.z.never().optional(),
-    weight: zod_1.z.never().optional(),
-});
-exports.elementDataSchema = numberElementDataSchema.or(percentageElementDataSchema).or(booleanElementDataSchema)
+    weight: zod_1.z.never().optional()
+}).catchall(zod_1.z.any());
+exports.elementDataSchema = zod_1.z.discriminatedUnion("type", [
+    numberElementDataSchema,
+    percentageElementDataSchema,
+    booleanElementDataSchema
+])
     .describe("ElementData - Element data containing value constraints and metadata");
 exports.criteriaTreeElementTypeSchema = zod_1.z
     .enum(["theme", "criterion", "task-group", "task", "task-item"])
@@ -90,7 +92,6 @@ exports.breadcrumbOptionsSchema = zod_1.z
     .or(zod_1.z.object({
     hideFromBreadcrumbs: zod_1.z
         .literal(false)
-        .nullable()
         .default(false)
         .describe("Whether to hide the element from the breadcrumbs"),
     breadcrumbTextFormat: zod_1.z
@@ -107,7 +108,6 @@ exports.documentTreeOptionsSchema = zod_1.z
     .or(zod_1.z.object({
     hideFromDocumentTree: zod_1.z
         .literal(false)
-        .nullable()
         .describe("Whether to hide the element from the document tree folder structure"),
     documentTreeFolderTextFormat: zod_1.z
         .string()
@@ -125,4 +125,10 @@ exports.reportOptionsSchema = zod_1.z
         .string()
         .describe("The format of the report row text, use ':code:' and ':title:' to define where the code and/or title should be inserted")
 });
-exports.treeResultSchema = numberElementDataSchema.omit({ weight: true, minimumValue: true, maximumValue: true }).or(percentageElementDataSchema.omit({ weight: true, minimumValue: true, maximumValue: true })).or(booleanElementDataSchema).describe("TreeResult - The result of the evaluation of a criteria set");
+const numberTreeResult = numberElementDataSchema.omit({ weight: true, minimumValue: true, maximumValue: true });
+const percentageTreeResult = percentageElementDataSchema.omit({ weight: true, minimumValue: true, maximumValue: true });
+exports.treeResultSchema = zod_1.z.discriminatedUnion("type", [
+    numberTreeResult,
+    percentageTreeResult,
+    booleanElementDataSchema
+]).describe("TreeResult - The result of the evaluation of a criteria set");