@builder-builder/builder 0.0.28 → 0.0.29

package/dist/entities/serialise.d.ts

@@ -9,117 +9,119 @@ export declare const entitiesMap: {
         readonly runtime: v.InstanceSchema<typeof import(".").BuilderModel, undefined>;
         readonly serialised: v.GenericSchema<import(".").BuilderModelSerialised>;
     };
-    readonly select: {
-        readonly runtime: v.InstanceSchema<typeof import(".").BuilderSelectConfig, undefined>;
-        readonly serialised: v.SchemaWithPipe<readonly [v.ObjectSchema<{
-            readonly type: v.LiteralSchema<"select", undefined>;
-            readonly options: v.SchemaWithPipe<readonly [v.TupleWithRestSchema<[v.StringSchema<undefined>], v.StringSchema<undefined>, undefined>, v.ReadonlyAction<[string, ...string[]]>]>;
-            readonly defaultValue: v.NullableSchema<v.StringSchema<undefined>, undefined>;
+    readonly value: {
+        readonly runtime: v.UnionSchema<[v.InstanceSchema<typeof import(".").BuilderValueConfig, undefined>, v.InstanceSchema<typeof import(".").BuilderSelectConfig, undefined>], undefined>;
+        readonly serialised: v.SchemaWithPipe<readonly [v.VariantSchema<"kind", [v.StrictObjectSchema<{
+            readonly kind: v.PicklistSchema<["string", "boolean", "number"], undefined>;
+            readonly type: v.LiteralSchema<"value", undefined>;
+            readonly defaultValue: v.NullableSchema<v.UnionSchema<[v.BooleanSchema<undefined>, v.StringSchema<undefined>, v.NumberSchema<undefined>], undefined>, undefined>;
             readonly isOptional: v.BooleanSchema<undefined>;
-            readonly optionLabels: v.RecordSchema<v.StringSchema<undefined>, v.StringSchema<undefined>, undefined>;
             readonly tags: v.OptionalSchema<v.SchemaWithPipe<readonly [v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.MinLengthAction<string, 1, undefined>]>, undefined>, v.ReadonlyAction<string[]>]>, undefined>;
-        }, undefined>, v.ReadonlyAction<{
-            type: "select";
-            readonly options: readonly [string, ...string[]];
-            defaultValue: string | null;
-            isOptional: boolean;
-            optionLabels: {
-                [x: string]: string;
-            };
-            tags?: readonly string[] | undefined;
-        }>]>;
-    };
-    readonly toggle: {
-        readonly runtime: v.InstanceSchema<typeof import(".").BuilderToggleConfig, undefined>;
-        readonly serialised: v.SchemaWithPipe<readonly [v.ObjectSchema<{
-            readonly type: v.LiteralSchema<"toggle", undefined>;
-            readonly kind: v.PicklistSchema<["string", "boolean", "number"], undefined>;
+        }, undefined>, v.StrictObjectSchema<{
+            readonly kind: v.LiteralSchema<"select", undefined>;
+            readonly options: v.SchemaWithPipe<readonly [v.TupleWithRestSchema<[v.StringSchema<undefined>], v.StringSchema<undefined>, undefined>, v.ReadonlyAction<[string, ...string[]]>]>;
+            readonly optionLabels: v.OptionalSchema<v.RecordSchema<v.StringSchema<undefined>, v.StringSchema<undefined>, undefined>, undefined>;
+            readonly type: v.LiteralSchema<"value", undefined>;
             readonly defaultValue: v.NullableSchema<v.UnionSchema<[v.BooleanSchema<undefined>, v.StringSchema<undefined>, v.NumberSchema<undefined>], undefined>, undefined>;
             readonly isOptional: v.BooleanSchema<undefined>;
             readonly tags: v.OptionalSchema<v.SchemaWithPipe<readonly [v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.MinLengthAction<string, 1, undefined>]>, undefined>, v.ReadonlyAction<string[]>]>, undefined>;
-        }, undefined>, v.ReadonlyAction<{
-            type: "toggle";
+        }, undefined>], undefined>, v.ReadonlyAction<{
             kind: "string" | "number" | "boolean";
+            type: "value";
+            defaultValue: string | number | boolean | null;
+            isOptional: boolean;
+            tags?: readonly string[] | undefined;
+        } | {
+            kind: "select";
+            readonly options: readonly [string, ...string[]];
+            optionLabels?: {
+                [x: string]: string;
+            } | undefined;
+            type: "value";
             defaultValue: string | number | boolean | null;
             isOptional: boolean;
             tags?: readonly string[] | undefined;
         }>]>;
     };
     readonly optionSelectMap: {
-        readonly runtime: v.GenericSchema<import("./when").BuilderMatchSelectMap<Readonly<{
+        readonly runtime: v.GenericSchema<import("./condition").BuilderMatchSelectMap<Readonly<{
             type: "parameter";
             id: string;
             name: string;
-        }> | Readonly<Readonly<{
-            type: "select";
-            readonly options: readonly [string, ...string[]];
-            defaultValue: string | null;
+        }> | Readonly<{
+            kind: "string" | "number" | "boolean";
+            type: "value";
+            defaultValue: string | number | boolean | null;
             isOptional: boolean;
-            optionLabels: {
-                [x: string]: string;
-            };
             tags?: readonly string[] | undefined;
-        }>> | Readonly<Readonly<{
-            type: "toggle";
-            kind: "string" | "number" | "boolean";
+        }> | Readonly<{
+            kind: "select";
+            readonly options: readonly [string, ...string[]];
+            optionLabels?: {
+                [x: string]: string;
+            } | undefined;
+            type: "value";
             defaultValue: string | number | boolean | null;
             isOptional: boolean;
             tags?: readonly string[] | undefined;
-        }>>>>;
-        readonly serialised: v.GenericSchema<import("./when").BuilderMatchSelectMap<Readonly<{
+        }>>>;
+        readonly serialised: v.GenericSchema<import("./condition").BuilderMatchSelectMap<Readonly<{
             type: "parameter";
             id: string;
             name: string;
-        }> | Readonly<Readonly<{
-            type: "select";
-            readonly options: readonly [string, ...string[]];
-            defaultValue: string | null;
+        }> | Readonly<{
+            kind: "string" | "number" | "boolean";
+            type: "value";
+            defaultValue: string | number | boolean | null;
             isOptional: boolean;
-            optionLabels: {
+            tags?: readonly string[] | undefined;
+        }> | Readonly<{
+            kind: "select";
+            readonly options: readonly [string, ...string[]];
+            optionLabels?: {
                 [x: string]: string;
-            };
+            } | undefined;
+            type: "value";
+            defaultValue: string | number | boolean | null;
+            isOptional: boolean;
             tags?: readonly string[] | undefined;
-        }>> | Readonly<Readonly<{
-            type: "toggle";
+        }>>>;
+    };
+    readonly optionCondition: {
+        readonly runtime: v.GenericSchema<import("./condition").BuilderConditionSerialised<Readonly<{
             kind: "string" | "number" | "boolean";
+            type: "value";
             defaultValue: string | number | boolean | null;
             isOptional: boolean;
             tags?: readonly string[] | undefined;
-        }>>>>;
-    };
-    readonly optionWhen: {
-        readonly runtime: v.GenericSchema<import("./when").BuilderWhenSerialised<Readonly<Readonly<{
-            type: "select";
+        }> | Readonly<{
+            kind: "select";
             readonly options: readonly [string, ...string[]];
-            defaultValue: string | null;
-            isOptional: boolean;
-            optionLabels: {
+            optionLabels?: {
                 [x: string]: string;
-            };
+            } | undefined;
+            type: "value";
+            defaultValue: string | number | boolean | null;
+            isOptional: boolean;
             tags?: readonly string[] | undefined;
-        }>> | Readonly<Readonly<{
-            type: "toggle";
+        }>>>;
+        readonly serialised: v.GenericSchema<import("./condition").BuilderConditionSerialised<Readonly<{
             kind: "string" | "number" | "boolean";
+            type: "value";
             defaultValue: string | number | boolean | null;
             isOptional: boolean;
             tags?: readonly string[] | undefined;
-        }>>>>;
-        readonly serialised: v.GenericSchema<import("./when").BuilderWhenSerialised<Readonly<Readonly<{
-            type: "select";
+        }> | Readonly<{
+            kind: "select";
             readonly options: readonly [string, ...string[]];
-            defaultValue: string | null;
-            isOptional: boolean;
-            optionLabels: {
+            optionLabels?: {
                 [x: string]: string;
-            };
-            tags?: readonly string[] | undefined;
-        }>> | Readonly<Readonly<{
-            type: "toggle";
-            kind: "string" | "number" | "boolean";
+            } | undefined;
+            type: "value";
             defaultValue: string | number | boolean | null;
             isOptional: boolean;
             tags?: readonly string[] | undefined;
-        }>>>>;
+        }>>>;
     };
     readonly componentConfig: {
         readonly runtime: v.InstanceSchema<typeof import(".").BuilderComponentConfig, undefined>;
@@ -177,7 +179,7 @@ export declare const entitiesMap: {
         }>]>;
     };
     readonly componentSelectMap: {
-        readonly runtime: v.GenericSchema<import("./when").BuilderMatchSelectMap<Readonly<{
+        readonly runtime: v.GenericSchema<import("./condition").BuilderMatchSelectMap<Readonly<{
             type: "parameter";
             id: string;
             name: string;
@@ -198,7 +200,7 @@ export declare const entitiesMap: {
             }>[];
             tags?: readonly string[] | undefined;
         }>>>;
-        readonly serialised: v.GenericSchema<import("./when").BuilderMatchSelectMap<Readonly<{
+        readonly serialised: v.GenericSchema<import("./condition").BuilderMatchSelectMap<Readonly<{
             type: "parameter";
             id: string;
             name: string;
@@ -220,8 +222,8 @@ export declare const entitiesMap: {
             tags?: readonly string[] | undefined;
         }>>>;
     };
-    readonly componentWhen: {
-        readonly runtime: v.GenericSchema<import("./when").BuilderWhenSerialised<Readonly<{
+    readonly componentCondition: {
+        readonly runtime: v.GenericSchema<import("./condition").BuilderConditionSerialised<Readonly<{
             details: Readonly<{
                 type: "parameter";
                 id: string;
@@ -238,7 +240,7 @@ export declare const entitiesMap: {
             }>[];
             tags?: readonly string[] | undefined;
         }>>>;
-        readonly serialised: v.GenericSchema<import("./when").BuilderWhenSerialised<Readonly<{
+        readonly serialised: v.GenericSchema<import("./condition").BuilderConditionSerialised<Readonly<{
             details: Readonly<{
                 type: "parameter";
                 id: string;
@@ -334,7 +336,7 @@ export declare const entitiesMap: {
         }>]>;
     };
     readonly collectionSelectMap: {
-        readonly runtime: v.GenericSchema<import("./when").BuilderMatchSelectMap<Readonly<{
+        readonly runtime: v.GenericSchema<import("./condition").BuilderMatchSelectMap<Readonly<{
             type: "parameter";
             id: string;
             name: string;
@@ -365,7 +367,7 @@ export declare const entitiesMap: {
             }>;
             tags?: readonly string[] | undefined;
         }>>>;
-        readonly serialised: v.GenericSchema<import("./when").BuilderMatchSelectMap<Readonly<{
+        readonly serialised: v.GenericSchema<import("./condition").BuilderMatchSelectMap<Readonly<{
             type: "parameter";
             id: string;
             name: string;
@@ -397,8 +399,8 @@ export declare const entitiesMap: {
             tags?: readonly string[] | undefined;
         }>>>;
     };
-    readonly collectionWhen: {
-        readonly runtime: v.GenericSchema<import("./when").BuilderWhenSerialised<Readonly<{
+    readonly collectionCondition: {
+        readonly runtime: v.GenericSchema<import("./condition").BuilderConditionSerialised<Readonly<{
             model: Readonly<{
                 type: "parameter";
                 id: string;
@@ -425,7 +427,7 @@ export declare const entitiesMap: {
             }>;
             tags?: readonly string[] | undefined;
         }>>>;
-        readonly serialised: v.GenericSchema<import("./when").BuilderWhenSerialised<Readonly<{
+        readonly serialised: v.GenericSchema<import("./condition").BuilderConditionSerialised<Readonly<{
             model: Readonly<{
                 type: "parameter";
                 id: string;
@@ -1393,12 +1395,77 @@ export declare const entitiesMap: {
         readonly serialised: v.SchemaWithPipe<readonly [v.ArraySchema<v.SchemaWithPipe<readonly [v.ObjectSchema<{
             readonly name: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.MinLengthAction<string, 1, undefined>]>;
             readonly kind: v.PicklistSchema<["option", "component", "collection"], undefined>;
+            readonly payload: v.OptionalSchema<v.LazySchema<v.SchemaWithPipe<readonly [v.VariantSchema<"kind", [v.StrictObjectSchema<{
+                readonly kind: v.PicklistSchema<["string", "boolean", "number"], undefined>;
+                readonly type: v.LiteralSchema<"value", undefined>;
+                readonly defaultValue: v.NullableSchema<v.UnionSchema<[v.BooleanSchema<undefined>, v.StringSchema<undefined>, v.NumberSchema<undefined>], undefined>, undefined>;
+                readonly isOptional: v.BooleanSchema<undefined>;
+                readonly tags: v.OptionalSchema<v.SchemaWithPipe<readonly [v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.MinLengthAction<string, 1, undefined>]>, undefined>, v.ReadonlyAction<string[]>]>, undefined>;
+            }, undefined>, v.StrictObjectSchema<{
+                readonly kind: v.LiteralSchema<"select", undefined>;
+                readonly options: v.SchemaWithPipe<readonly [v.TupleWithRestSchema<[v.StringSchema<undefined>], v.StringSchema<undefined>, undefined>, v.ReadonlyAction<[string, ...string[]]>]>;
+                readonly optionLabels: v.OptionalSchema<v.RecordSchema<v.StringSchema<undefined>, v.StringSchema<undefined>, undefined>, undefined>;
+                readonly type: v.LiteralSchema<"value", undefined>;
+                readonly defaultValue: v.NullableSchema<v.UnionSchema<[v.BooleanSchema<undefined>, v.StringSchema<undefined>, v.NumberSchema<undefined>], undefined>, undefined>;
+                readonly isOptional: v.BooleanSchema<undefined>;
+                readonly tags: v.OptionalSchema<v.SchemaWithPipe<readonly [v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.MinLengthAction<string, 1, undefined>]>, undefined>, v.ReadonlyAction<string[]>]>, undefined>;
+            }, undefined>], undefined>, v.ReadonlyAction<{
+                kind: "string" | "number" | "boolean";
+                type: "value";
+                defaultValue: string | number | boolean | null;
+                isOptional: boolean;
+                tags?: readonly string[] | undefined;
+            } | {
+                kind: "select";
+                readonly options: readonly [string, ...string[]];
+                optionLabels?: {
+                    [x: string]: string;
+                } | undefined;
+                type: "value";
+                defaultValue: string | number | boolean | null;
+                isOptional: boolean;
+                tags?: readonly string[] | undefined;
+            }>]>>, undefined>;
         }, undefined>, v.ReadonlyAction<{
             name: string;
             kind: "option" | "component" | "collection";
+            payload?: Readonly<{
+                kind: "string" | "number" | "boolean";
+                type: "value";
+                defaultValue: string | number | boolean | null;
+                isOptional: boolean;
+                tags?: readonly string[] | undefined;
+            }> | Readonly<{
+                kind: "select";
+                readonly options: readonly [string, ...string[]];
+                optionLabels?: {
+                    [x: string]: string;
+                } | undefined;
+                type: "value";
+                defaultValue: string | number | boolean | null;
+                isOptional: boolean;
+                tags?: readonly string[] | undefined;
+            }> | undefined;
         }>]>, undefined>, v.ReadonlyAction<Readonly<{
             name: string;
             kind: "option" | "component" | "collection";
+            payload?: Readonly<{
+                kind: "string" | "number" | "boolean";
+                type: "value";
+                defaultValue: string | number | boolean | null;
+                isOptional: boolean;
+                tags?: readonly string[] | undefined;
+            }> | Readonly<{
+                kind: "select";
+                readonly options: readonly [string, ...string[]];
+                optionLabels?: {
+                    [x: string]: string;
+                } | undefined;
+                type: "value";
+                defaultValue: string | number | boolean | null;
+                isOptional: boolean;
+                tags?: readonly string[] | undefined;
+            }> | undefined;
         }>[]>]>;
     };
     readonly paths: {
@@ -1427,7 +1494,7 @@ export declare const validateString: (input: unknown, references?: import("./ref
 export declare const validateBoolean: (input: unknown, references?: import("./references").BuilderReferences, issues?: import("../errors/errors").BuilderIssuesScope) => import("./validated").ValidationResult<boolean>;
 export type EntitiesMap = typeof entitiesMap;
 export type EntitiesSerialisedSchemas = EntitiesMap[BuilderEntityKind]['serialised'];
-export declare const BuilderEntityKindSchema: v.PicklistSchema<readonly ["builder", "model", "select", "toggle", "optionSelectMap", "optionWhen", "componentConfig", "componentSelectMap", "componentWhen", "collectionConfig", "collectionSelectMap", "collectionWhen", "ui", "uiDescribe", "uiItems", "uiPage", "uiPages", "uiInput", "pricing", "pricingRates", "expectations", "paths", "path", "number", "string", "boolean"], undefined>;
+export declare const BuilderEntityKindSchema: v.PicklistSchema<readonly ["builder", "model", "value", "optionSelectMap", "optionCondition", "componentConfig", "componentSelectMap", "componentCondition", "collectionConfig", "collectionSelectMap", "collectionCondition", "ui", "uiDescribe", "uiItems", "uiPage", "uiPages", "uiInput", "pricing", "pricingRates", "expectations", "paths", "path", "number", "string", "boolean"], undefined>;
 export declare const BuilderEntitySerialisedSchema: v.GenericSchema<{ [Kind in BuilderEntityKind]: v.InferOutput<EntitiesMap[Kind]["serialised"]>; }[BuilderEntityKind]>;
 type SerialiseMap = {
     readonly [EntityKind in keyof EntitiesMap]: (input: v.InferOutput<EntitiesMap[EntityKind]['runtime']>) => v.InferOutput<EntitiesMap[EntityKind]['serialised']>;

package/dist/entities/serialise.js

@@ -3,27 +3,29 @@ import { check } from '../errors/index.js';
 import { BooleanSchema, NumberSchema, StringSchema } from '../primitive.js';
 import { BuilderParameterSchema, BuilderRefSchema, isParamable } from '../references.js';
 import { BuilderSchema, BuilderSerialisedSchema } from './builder/index.js';
-import { BuilderCollectionConfigSchema, BuilderCollectionConfigSerialisedSchema, BuilderCollectionSchema, BuilderCollectionSelectMapSerialisedSchema, BuilderCollectionWhenSerialisedSchema } from './collection/index.js';
-import { BuilderComponentConfigSchema, BuilderComponentConfigSerialisedSchema, BuilderComponentDetailSchema, BuilderComponentSchema, BuilderComponentSelectMapSerialisedSchema, BuilderComponentWhenSerialisedSchema } from './component/index.js';
+import { BuilderCollectionConfigSchema, BuilderCollectionConfigSerialisedSchema, BuilderCollectionSchema, BuilderCollectionSelectMapSerialisedSchema, BuilderCollectionConditionSerialisedSchema } from './collection/index.js';
+import { BuilderComponentConfigSchema, BuilderComponentConfigSerialisedSchema, BuilderComponentDetailSchema, BuilderComponentSchema, BuilderComponentSelectMapSerialisedSchema, BuilderComponentConditionSerialisedSchema } from './component/index.js';
 import { BuilderExpectationSchema, BuilderExpectationsSchema, BuilderExpectationsSerialisedSchema } from './expectation.js';
 import { builderEntityKinds, createEntityValidator } from './kind.js';
 import { BuilderModelSchema, BuilderModelSerialisedSchema } from './model/index.js';
-import { BuilderOptionSchema, BuilderOptionSelectMapSerialisedSchema, BuilderOptionWhenSerialisedSchema, BuilderSelectConfigSchema, BuilderSelectConfigSerialisedSchema, BuilderToggleConfigSchema, BuilderToggleConfigSerialisedSchema } from './option/index.js';
+import { BuilderOptionSchema, BuilderOptionSelectMapSerialisedSchema, BuilderOptionConditionSerialisedSchema, BuilderSelectConfigSchema, BuilderValueConfigSchema, BuilderValueConfigSerialisedSchema } from './option/index.js';
 import { BuilderPathSchema, BuilderPathsSchema } from './paths.js';
 import { BuilderPricingSchema, BuilderPricingSerialisedSchema, BuilderRatesSchema } from './pricing/index.js';
 import { BuilderUIDescribeSchema, BuilderUIDescribeSerialisedSchema, BuilderUIInputSchema, BuilderUIInputSerialisedSchema, BuilderUIItemsSerialisedSchema, BuilderUIPageSchema, BuilderUIPageSerialisedSchema, BuilderUIPagesSchema, BuilderUIPagesSerialisedSchema, BuilderUISchema, BuilderUISerialisedSchema } from './ui/index.js';
 export const entitiesMap = {
     builder: { runtime: BuilderSchema, serialised: BuilderSerialisedSchema },
     model: { runtime: BuilderModelSchema, serialised: BuilderModelSerialisedSchema },
-    select: { runtime: BuilderSelectConfigSchema, serialised: BuilderSelectConfigSerialisedSchema },
-    toggle: { runtime: BuilderToggleConfigSchema, serialised: BuilderToggleConfigSerialisedSchema },
+    value: {
+        runtime: v.union([BuilderValueConfigSchema, BuilderSelectConfigSchema]),
+        serialised: BuilderValueConfigSerialisedSchema
+    },
     optionSelectMap: {
         runtime: BuilderOptionSelectMapSerialisedSchema,
         serialised: BuilderOptionSelectMapSerialisedSchema
     },
-    optionWhen: {
-        runtime: BuilderOptionWhenSerialisedSchema,
-        serialised: BuilderOptionWhenSerialisedSchema
+    optionCondition: {
+        runtime: BuilderOptionConditionSerialisedSchema,
+        serialised: BuilderOptionConditionSerialisedSchema
     },
     componentConfig: {
         runtime: BuilderComponentConfigSchema,
@@ -33,9 +35,9 @@ export const entitiesMap = {
         runtime: BuilderComponentSelectMapSerialisedSchema,
         serialised: BuilderComponentSelectMapSerialisedSchema
     },
-    componentWhen: {
-        runtime: BuilderComponentWhenSerialisedSchema,
-        serialised: BuilderComponentWhenSerialisedSchema
+    componentCondition: {
+        runtime: BuilderComponentConditionSerialisedSchema,
+        serialised: BuilderComponentConditionSerialisedSchema
     },
     collectionConfig: {
         runtime: BuilderCollectionConfigSchema,
@@ -45,9 +47,9 @@ export const entitiesMap = {
         runtime: BuilderCollectionSelectMapSerialisedSchema,
         serialised: BuilderCollectionSelectMapSerialisedSchema
     },
-    collectionWhen: {
-        runtime: BuilderCollectionWhenSerialisedSchema,
-        serialised: BuilderCollectionWhenSerialisedSchema
+    collectionCondition: {
+        runtime: BuilderCollectionConditionSerialisedSchema,
+        serialised: BuilderCollectionConditionSerialisedSchema
     },
     ui: { runtime: BuilderUISchema, serialised: BuilderUISerialisedSchema },
     uiDescribe: { runtime: BuilderUIDescribeSchema, serialised: BuilderUIDescribeSerialisedSchema },
@@ -165,22 +167,25 @@ const serialiserMap = [
         max: serialiseValue(value.max),
         tags: value.tags
     })),
-    serialiser(BuilderSelectConfigSchema, (value) => ({
-        type: 'select',
-        options: value.options,
+    serialiser(BuilderValueConfigSchema, (value) => ({
+        type: 'value',
+        kind: value.kind,
         defaultValue: value.defaultValue,
         isOptional: value.isOptional,
-        optionLabels: value.optionLabels,
         tags: value.tags
     })),
-    serialiser(BuilderToggleConfigSchema, (value) => ({
-        type: 'toggle',
+    serialiser(BuilderSelectConfigSchema, (value) => ({
+        type: 'value',
         kind: value.kind,
         defaultValue: value.defaultValue,
         isOptional: value.isOptional,
+        options: value.options,
+        optionLabels: value.optionLabels,
         tags: value.tags
     })),
-    serialiser(BuilderExpectationSchema, (value) => ({ name: value.name, kind: value.kind }))
+    serialiser(BuilderExpectationSchema, (value) => value.payload == null
+        ? { name: value.name, kind: value.kind }
+        : { name: value.name, kind: value.kind, payload: serialiseValue(value.payload) })
 ];
 function serialiseNamedEntry(value) {
     const entry = {

package/dist/entities/ui/input.d.ts

@@ -2,7 +2,7 @@ import type { Paramable, ParamableSerialised } from '../../references';
 import type { BuilderModelGeneric, BuilderModelState, BuilderModelStateOf } from '../model/index';
 import type { BuilderPath } from '../paths';
 import type { BuilderTags } from '../tags';
-import type { BuilderValidPath } from '../when';
+import type { BuilderValidPath } from '../condition';
 import * as v from 'valibot';
 export type BuilderUIInputMetadata = Paramable<Record<string, Paramable<unknown>>>;
 export type BuilderUIInputMetadataSerialised = ParamableSerialised<Record<string, ParamableSerialised<unknown>>>;

package/dist/entities/validated.d.ts

@@ -38,7 +38,7 @@ export type BuilderInstancesValidated = Prettify<Validated<BuilderInstances>>;
 export type BuilderVariantsValidated = Prettify<Validated<BuilderVariants>>;
 export type BuilderOptionValidated = Prettify<Validated<BuilderOptionSerialised>>;
 export type BuilderOptionsValidated = Prettify<Validated<BuilderOptionsSerialised>>;
-export type BuilderOptionConfigValidated = BuilderValidatedMap['select' | 'toggle'];
+export type BuilderOptionConfigValidated = BuilderValidatedMap['value'];
 export type BuilderComponentValidated = Prettify<Validated<BuilderComponentSerialised>>;
 export type BuilderComponentsValidated = Prettify<Validated<BuilderComponentsSerialised>>;
 export type BuilderComponentConfigValidated = BuilderValidatedMap['componentConfig'];

package/dist/errors/errors.d.ts

@@ -12,7 +12,7 @@ export declare class BuilderIssuesScope {
         location: BuilderIssueLocation;
         root: unknown;
     } & {
-        target: "string" | "number" | "boolean" | "builder" | "model" | "select" | "toggle" | "optionSelectMap" | "optionWhen" | "componentConfig" | "componentSelectMap" | "componentWhen" | "collectionConfig" | "collectionSelectMap" | "collectionWhen" | "ui" | "uiDescribe" | "uiItems" | "uiPage" | "uiPages" | "uiInput" | "pricing" | "pricingRates" | "expectations" | "paths" | "path";
+        target: "string" | "number" | "boolean" | "value" | "builder" | "model" | "optionSelectMap" | "optionCondition" | "componentConfig" | "componentSelectMap" | "componentCondition" | "collectionConfig" | "collectionSelectMap" | "collectionCondition" | "ui" | "uiDescribe" | "uiItems" | "uiPage" | "uiPages" | "uiInput" | "pricing" | "pricingRates" | "expectations" | "paths" | "path";
     };
     entityEmptyLabel(): {
         kind: "entity-empty-label";
@@ -49,8 +49,8 @@ export declare class BuilderIssuesScope {
         location: BuilderIssueLocation;
         root: unknown;
     } & object;
-    entityInvalidToggleDefault(): {
-        kind: "entity-invalid-toggle-default";
+    entityInvalidValueDefault(): {
+        kind: "entity-invalid-value-default";
         location: BuilderIssueLocation;
         root: unknown;
     } & object;
@@ -104,6 +104,11 @@ export declare class BuilderIssuesScope {
         location: BuilderIssueLocation;
         root: unknown;
     } & object;
+    modelInvalidExpectation(): {
+        kind: "model-invalid-expectation";
+        location: BuilderIssueLocation;
+        root: unknown;
+    } & object;
     modelEmptyComponents(): {
         kind: "model-empty-components";
         location: BuilderIssueLocation;

package/dist/errors/errors.js

@@ -45,8 +45,8 @@ export class BuilderIssuesScope {
     entityInvalidSelectLabel() {
         return this.#addError('entity-invalid-select-label');
     }
-    entityInvalidToggleDefault() {
-        return this.#addError('entity-invalid-toggle-default');
+    entityInvalidValueDefault() {
+        return this.#addError('entity-invalid-value-default');
     }
     entityDuplicateDetail() {
         return this.#addError('entity-duplicate-detail');
@@ -78,6 +78,9 @@ export class BuilderIssuesScope {
     modelUnmetExpectation() {
         return this.#addError('model-unmet-expectation');
     }
+    modelInvalidExpectation() {
+        return this.#addError('model-invalid-expectation');
+    }
     modelEmptyComponents() {
         return this.#addError('model-empty-components');
     }

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export * from './public.js';
-export { BuilderCollectionConfigSchema, BuilderCollectionConfigSerialisedSchema, BuilderCollectionSchema, BuilderCollectionSelectMapSerialisedSchema, BuilderCollectionSerialisedSchema, BuilderCollectionsSerialisedSchema, BuilderCollectionWhenSerialisedSchema, BuilderComponentConfigSchema, BuilderComponentConfigSerialisedSchema, BuilderComponentDetailSchema, BuilderComponentDetailSerialisedSchema, BuilderComponentDetailsSchema, BuilderComponentDetailsSerialisedSchema, BuilderComponentDetailKindSchema, BuilderComponentSchema, BuilderComponentSelectMapSerialisedSchema, BuilderComponentSerialisedSchema, BuilderComponentsSerialisedSchema, BuilderComponentWhenSerialisedSchema, BuilderDescriptionItemSchema, BuilderDescriptionSchema, BuilderEntityKindSchema, BuilderEntitySerialisedSchema, BuilderExpectationKindSchema, BuilderExpectationSchema, BuilderExpectationSerialisedSchema, BuilderExpectationsSchema, BuilderExpectationsSerialisedSchema, BuilderModelSchema, BuilderModelSerialisedSchema, BuilderOptionConfigSchema, BuilderOptionConfigSerialisedSchema, BuilderOptionSchema, BuilderOptionSelectMapSerialisedSchema, BuilderOptionSerialisedSchema, BuilderOptionsSerialisedSchema, BuilderOptionWhenSerialisedSchema, BuilderPathSchema, BuilderPathsSchema, BuilderReferenceSchema, BuilderReferencesSchema, BuilderSchema, BuilderSelectConfigSchema, BuilderSelectConfigSerialisedSchema, BuilderSerialisedSchema, BuilderToggleConfigSchema, BuilderToggleConfigSerialisedSchema, BuilderUIDescribeSchema, BuilderUIDescribeSerialisedSchema, BuilderUIItemSerialisedSchema, BuilderUIItemsSerialisedSchema, BuilderUIPageSchema, BuilderUIPageSerialisedSchema, BuilderUIPagesSchema, BuilderUIPagesSerialisedSchema, BuilderUISchema, BuilderUISerialisedSchema, BuilderWhenConfigSchema, BuilderWhenEnableSchema, BuilderWhenMatchSchema, BuilderWhenUnlessSchema } from './entities/index.js';
+export { BuilderCollectionConfigSchema, BuilderCollectionConfigSerialisedSchema, BuilderCollectionSchema, BuilderCollectionSelectMapSerialisedSchema, BuilderCollectionSerialisedSchema, BuilderCollectionsSerialisedSchema, BuilderCollectionConditionSerialisedSchema, BuilderComponentConfigSchema, BuilderComponentConfigSerialisedSchema, BuilderComponentDetailSchema, BuilderComponentDetailSerialisedSchema, BuilderComponentDetailsSchema, BuilderComponentDetailsSerialisedSchema, BuilderComponentDetailKindSchema, BuilderComponentSchema, BuilderComponentSelectMapSerialisedSchema, BuilderComponentSerialisedSchema, BuilderComponentsSerialisedSchema, BuilderComponentConditionSerialisedSchema, BuilderDescriptionItemSchema, BuilderDescriptionSchema, BuilderEntityKindSchema, BuilderEntitySerialisedSchema, BuilderExpectationKindSchema, BuilderExpectationSchema, BuilderExpectationSerialisedSchema, BuilderExpectationsSchema, BuilderExpectationsSerialisedSchema, BuilderModelSchema, BuilderModelSerialisedSchema, BuilderOptionConfigSchema, BuilderOptionConfigSerialisedSchema, BuilderOptionSchema, BuilderOptionSelectMapSerialisedSchema, BuilderOptionSerialisedSchema, BuilderOptionsSerialisedSchema, BuilderOptionConditionSerialisedSchema, BuilderPathSchema, BuilderPathsSchema, BuilderReferenceSchema, BuilderReferencesSchema, BuilderSchema, BuilderSerialisedSchema, BuilderSelectConfigSchema, BuilderValueConfigSchema, BuilderValueConfigSerialisedSchema, BuilderUIDescribeSchema, BuilderUIDescribeSerialisedSchema, BuilderUIItemSerialisedSchema, BuilderUIItemsSerialisedSchema, BuilderUIPageSchema, BuilderUIPageSerialisedSchema, BuilderUIPagesSchema, BuilderUIPagesSerialisedSchema, BuilderUISchema, BuilderUISerialisedSchema, BuilderConditionConfigSchema, BuilderConditionMatchSchema, BuilderConditionUnlessSchema } from './entities/index.js';
 export { BuilderEnvironmentSchema } from './environment.js';
 export { BuilderComponentVariantsSchema, BuilderVariantsSchema } from './instance.js';

package/dist/index.js

@@ -1,4 +1,4 @@
 export * from './public.js';
-export { BuilderCollectionConfigSchema, BuilderCollectionConfigSerialisedSchema, BuilderCollectionSchema, BuilderCollectionSelectMapSerialisedSchema, BuilderCollectionSerialisedSchema, BuilderCollectionsSerialisedSchema, BuilderCollectionWhenSerialisedSchema, BuilderComponentConfigSchema, BuilderComponentConfigSerialisedSchema, BuilderComponentDetailSchema, BuilderComponentDetailSerialisedSchema, BuilderComponentDetailsSchema, BuilderComponentDetailsSerialisedSchema, BuilderComponentDetailKindSchema, BuilderComponentSchema, BuilderComponentSelectMapSerialisedSchema, BuilderComponentSerialisedSchema, BuilderComponentsSerialisedSchema, BuilderComponentWhenSerialisedSchema, BuilderDescriptionItemSchema, BuilderDescriptionSchema, BuilderEntityKindSchema, BuilderEntitySerialisedSchema, BuilderExpectationKindSchema, BuilderExpectationSchema, BuilderExpectationSerialisedSchema, BuilderExpectationsSchema, BuilderExpectationsSerialisedSchema, BuilderModelSchema, BuilderModelSerialisedSchema, BuilderOptionConfigSchema, BuilderOptionConfigSerialisedSchema, BuilderOptionSchema, BuilderOptionSelectMapSerialisedSchema, BuilderOptionSerialisedSchema, BuilderOptionsSerialisedSchema, BuilderOptionWhenSerialisedSchema, BuilderPathSchema, BuilderPathsSchema, BuilderReferenceSchema, BuilderReferencesSchema, BuilderSchema, BuilderSelectConfigSchema, BuilderSelectConfigSerialisedSchema, BuilderSerialisedSchema, BuilderToggleConfigSchema, BuilderToggleConfigSerialisedSchema, BuilderUIDescribeSchema, BuilderUIDescribeSerialisedSchema, BuilderUIItemSerialisedSchema, BuilderUIItemsSerialisedSchema, BuilderUIPageSchema, BuilderUIPageSerialisedSchema, BuilderUIPagesSchema, BuilderUIPagesSerialisedSchema, BuilderUISchema, BuilderUISerialisedSchema, BuilderWhenConfigSchema, BuilderWhenEnableSchema, BuilderWhenMatchSchema, BuilderWhenUnlessSchema } from './entities/index.js';
+export { BuilderCollectionConfigSchema, BuilderCollectionConfigSerialisedSchema, BuilderCollectionSchema, BuilderCollectionSelectMapSerialisedSchema, BuilderCollectionSerialisedSchema, BuilderCollectionsSerialisedSchema, BuilderCollectionConditionSerialisedSchema, BuilderComponentConfigSchema, BuilderComponentConfigSerialisedSchema, BuilderComponentDetailSchema, BuilderComponentDetailSerialisedSchema, BuilderComponentDetailsSchema, BuilderComponentDetailsSerialisedSchema, BuilderComponentDetailKindSchema, BuilderComponentSchema, BuilderComponentSelectMapSerialisedSchema, BuilderComponentSerialisedSchema, BuilderComponentsSerialisedSchema, BuilderComponentConditionSerialisedSchema, BuilderDescriptionItemSchema, BuilderDescriptionSchema, BuilderEntityKindSchema, BuilderEntitySerialisedSchema, BuilderExpectationKindSchema, BuilderExpectationSchema, BuilderExpectationSerialisedSchema, BuilderExpectationsSchema, BuilderExpectationsSerialisedSchema, BuilderModelSchema, BuilderModelSerialisedSchema, BuilderOptionConfigSchema, BuilderOptionConfigSerialisedSchema, BuilderOptionSchema, BuilderOptionSelectMapSerialisedSchema, BuilderOptionSerialisedSchema, BuilderOptionsSerialisedSchema, BuilderOptionConditionSerialisedSchema, BuilderPathSchema, BuilderPathsSchema, BuilderReferenceSchema, BuilderReferencesSchema, BuilderSchema, BuilderSerialisedSchema, BuilderSelectConfigSchema, BuilderValueConfigSchema, BuilderValueConfigSerialisedSchema, BuilderUIDescribeSchema, BuilderUIDescribeSerialisedSchema, BuilderUIItemSerialisedSchema, BuilderUIItemsSerialisedSchema, BuilderUIPageSchema, BuilderUIPageSerialisedSchema, BuilderUIPagesSchema, BuilderUIPagesSerialisedSchema, BuilderUISchema, BuilderUISerialisedSchema, BuilderConditionConfigSchema, BuilderConditionMatchSchema, BuilderConditionUnlessSchema } from './entities/index.js';
 export { BuilderEnvironmentSchema } from './environment.js';
 export { BuilderComponentVariantsSchema, BuilderVariantsSchema } from './instance.js';

package/dist/mappers/dependencies.js

@@ -1,4 +1,4 @@
-import { BuilderPathSchema, BuilderPathsSchema, BuilderWhenMatchSchema, BuilderWhenUnlessSchema } from '../entities/index.js';
+import { BuilderPathSchema, BuilderPathsSchema, BuilderConditionMatchSchema, BuilderConditionUnlessSchema } from '../entities/index.js';
 import { check } from '../errors/index.js';
 export function dependencies(model) {
     const entries = [...model.options, ...model.collections, ...model.components];
@@ -31,11 +31,12 @@ export function dependencies(model) {
 export function dependencyKeys(payload, paths = []) {
     const conditionPaths = check.is(BuilderPathsSchema, paths) ? paths : [];
     const keys = new Set(conditionPaths.map(([first]) => String(first)));
-    if (check.is(BuilderWhenMatchSchema, payload) && check.is(BuilderPathSchema, payload.matchPath)) {
+    if (check.is(BuilderConditionMatchSchema, payload) &&
+        check.is(BuilderPathSchema, payload.matchPath)) {
         const [firstMatchSegment] = payload.matchPath;
         keys.add(String(firstMatchSegment));
     }
-    else if (check.is(BuilderWhenUnlessSchema, payload) &&
+    else if (check.is(BuilderConditionUnlessSchema, payload) &&
         check.is(BuilderPathSchema, payload.unlessPath)) {
         const [firstUnlessSegment] = payload.unlessPath;
         keys.add(String(firstUnlessSegment));