@builder-builder/builder 0.0.11 → 0.0.12

package/dist/entities/when.d.ts

@@ -112,6 +112,8 @@ export declare const BuilderWhenConfigSchema: v.SchemaWithPipe<readonly [v.Varia
         id: string;
     }>]>, v.SchemaWithPipe<readonly [v.ArraySchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>], undefined>, undefined>, v.ReadonlyAction<(string | number)[]>]>], undefined>;
 }, undefined>], undefined>, v.ReadonlyAction<{
+    type: "enable";
+} | {
     type: "match";
     matchPath: readonly (string | number)[] | Readonly<{
         type: "parameter";
@@ -131,8 +133,6 @@ export declare const BuilderWhenConfigSchema: v.SchemaWithPipe<readonly [v.Varia
         type: "ref";
         id: string;
     }>;
-} | {
-    type: "enable";
 }>]>;
 export type BuilderWhenConfig = v.InferOutput<typeof BuilderWhenConfigSchema>;
 export type BuilderWhenGeneric = BuilderWhen<unknown, unknown, unknown, unknown>;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export type { BB, BBOptions } from './bb';
-export type { BuilderBindings, BuilderBindingsSerialised, BuilderCollection, BuilderCollectionConfig, BuilderCollectionConfigSerialised, BuilderCollections, BuilderCollectionSerialised, BuilderCollectionsSerialised, BuilderCollectionWhen, BuilderCollectionWhenSerialised, BuilderComponent, BuilderComponentDetails, BuilderComponentDetailsSerialised, BuilderComponentField, BuilderComponentFields, BuilderComponentFieldSerialised, BuilderComponentFieldsSerialised, BuilderComponentFieldValueType, BuilderComponents, BuilderComponentSerialised, BuilderComponentsSerialised, BuilderComponentWhen, BuilderComponentWhenSerialised, BuilderDescription, BuilderDescriptionItem, BuilderEntityKind, BuilderEntitySerialised, BuilderExpectation, BuilderExpectationKind, BuilderExpectations, BuilderExpectationSerialised, BuilderExpectationsSerialised, BuilderInstanceOf, BuilderModel, BuilderModels, BuilderModelSerialised, BuilderModelValidated, BuilderOption, BuilderOptions, BuilderOptionSerialised, BuilderOptionsSerialised, BuilderOptionValues, BuilderOptionValuesSerialised, BuilderOptionWhen, BuilderOptionWhenSerialised, BuilderRefEntities, BuilderRefEntity, BuilderSelectType, BuilderSelectTypeLabels, BuilderSelectTypeSerialised, BuilderSelectTypeValues, BuilderSerialised, BuilderToggleType, BuilderToggleTypeSerialised, BuilderToggleValueType, BuilderUI, BuilderUIDescribe, BuilderUIDescribeSerialised, BuilderUIItem, BuilderUIItems, BuilderUIItemsSerialised, BuilderUIPage, BuilderUIPages, BuilderUIPageSerialised, BuilderUIPagesSerialised, BuilderUIs, BuilderUIsSerialised, BuilderUISerialised, BuilderUIValidated, BuilderValidated, BuilderEnableConfig, BuilderMatchConfig, BuilderMatchSelectMap, BuilderUnlessConfig, BuilderWhen, BuilderWhenConfig, BuilderWhenSerialised } from './entities/index';
+export type { BuilderBindings, BuilderBindingsSerialised, BuilderCollection, BuilderCollectionConfig, BuilderCollectionConfigSerialised, BuilderCollections, BuilderCollectionSerialised, BuilderCollectionsSerialised, BuilderCollectionWhen, BuilderCollectionWhenSerialised, BuilderComponent, BuilderComponentDetails, BuilderComponentDetailsSerialised, BuilderComponentField, BuilderComponentFields, BuilderComponentFieldSerialised, BuilderComponentFieldsSerialised, BuilderComponentFieldValueType, BuilderComponents, BuilderComponentSerialised, BuilderComponentsSerialised, BuilderComponentWhen, BuilderComponentWhenSerialised, BuilderDescription, BuilderDescriptionItem, BuilderEntityKind, BuilderEntitySerialised, BuilderExpectation, BuilderExpectationKind, BuilderExpectations, BuilderExpectationSerialised, BuilderExpectationsSerialised, BuilderInstanceOf, BuilderModel, BuilderModels, BuilderModelSerialised, BuilderModelValidated, BuilderOption, BuilderOptions, BuilderOptionSerialised, BuilderOptionsSerialised, BuilderOptionValues, BuilderOptionValuesSerialised, BuilderOptionWhen, BuilderOptionWhenSerialised, BuilderRefEntities, BuilderRefEntity, BuilderSelectType, BuilderSelectTypeLabels, BuilderSelectTypeSerialised, BuilderSelectTypeValues, BuilderSerialised, BuilderToggleType, BuilderToggleTypeSerialised, BuilderToggleValueType, BuilderUI, BuilderUIDescribe, BuilderUIDescribeSerialised, BuilderUIItem, BuilderUIItems, BuilderUIItemsSerialised, BuilderUIPage, BuilderUIPages, BuilderUIPageSerialised, BuilderUIPagesSerialised, BuilderUIs, BuilderUIsSerialised, BuilderUISerialised, BuilderUIValidated, BuilderValidated, BuilderComponentVariantsValidated, BuilderInstanceValidated, BuilderEnableConfig, BuilderMatchConfig, BuilderMatchSelectMap, BuilderUnlessConfig, BuilderWhen, BuilderWhenConfig, BuilderWhenSerialised } from './entities/index';
 export type { BuilderEnvironment } from './environment';
 export type { BuilderError, BuilderErrorBase, BuilderErrorLocation, BuilderErrors } from './exception';
 export type { BuilderComponentVariantsValidationResult, BuilderErrorDuplicateName, BuilderErrorInvalidCollection, BuilderErrorInvalidCollectionBounds, BuilderErrorInvalidDetail, BuilderErrorInvalidInput, BuilderErrorInvalidOption, BuilderErrorInvalidPath, BuilderErrorInvalidPathReason, BuilderErrorInvalidSelectMapKey, BuilderErrorInvalidVariant, BuilderErrorMissingComponent, BuilderErrorMissingDetail, BuilderErrorMissingReference, BuilderErrorMissingVariant, BuilderErrorUnboundParameter, BuilderErrorUnexpectedComponent, BuilderErrorUnexpectedDetail, BuilderErrorUnmetExpectation, BuilderErrorUnvalidated, BuilderInstanceValidationResult, BuilderModelValidationResult, BuilderOrder, BuilderRenderOption, BuilderRenderOptions, BuilderRenderPage, BuilderRenderPages, BuilderRenderResult, BuilderRenderUpdate, BuilderUIValidationResult, BuilderValidationResult, BuilderVariantsValidationOptions } from './mappers/index';

package/dist/mappers/instance.js

@@ -1,13 +1,14 @@
 import { check } from '../check.js';
-import { optionValueSchema } from '../entities/index.js';
+import { modelsMerge, optionValueSchema } from '../entities/index.js';
 import { resolveCollection, resolveOption } from './resolve.js';
 export function createInstance(entity, partial = {}, refs = []) {
     const model = 'model' in entity ? entity.model : entity;
     return buildInstance(model, partial, refs);
 }
 function buildInstance(model, partial, refs) {
+    const merged = modelsMerge(model);
     let instance = { ...partial };
-    model.options.forEach((option) => {
+    merged.options.forEach((option) => {
         const { name } = option;
         const payload = resolveOption(option, instance, refs);
         if (payload == null) {
@@ -19,7 +20,7 @@ function buildInstance(model, partial, refs) {
         }
         instance = { ...instance, [name]: payload.defaultValue };
     });
-    model.collections.forEach((collection) => {
+    merged.collections.forEach((collection) => {
         const { name } = collection;
         const payload = resolveCollection(collection, instance, refs);
         if (payload == null) {

package/dist/mappers/render/pages.d.ts

@@ -3,6 +3,7 @@ import type { BuilderPrimitive } from '../../primitive';
 import type { BuilderInstance } from '../../instance';
 export type BuilderRenderUpdate = (model: BuilderInstance, primitive: BuilderPrimitive) => BuilderInstance;
 export type BuilderRenderOption = Readonly<{
+    name: string;
     value: BuilderPrimitive;
     update: BuilderRenderUpdate;
     option: BuilderOptionValuesSerialised;

package/dist/mappers/render/render.js

@@ -1,5 +1,6 @@
 import * as v from 'valibot';
 import { check } from '../../check.js';
+import { modelsMerge } from '../../entities/model/index.js';
 import { BuilderInstancesSchema } from '../../instance.js';
 import { readPath } from '../../paths.js';
 import { resolveCollection, resolveOption, resolveRef } from '../resolve.js';
@@ -29,20 +30,23 @@ export function render(builder, instance, refs = []) {
             }
             const itemInstances = currentInstance[item.name];
             check.assert(BuilderInstancesSchema, itemInstances, 'Collection field is not an array! ❌');
+            const mergedItemModel = modelsMerge(collection.model);
             itemInstances.forEach((itemInstance, index) => {
-                walkItems(item.items, collection.model, [...collectionPath, item.name, index], [...labelContext, `${ordinal(index)} ${composeLabel(item.label)}`], itemInstance);
+                walkItems(item.items, mergedItemModel, [...collectionPath, item.name, index], [...labelContext, `${ordinal(index)} ${composeLabel(item.label)}`], itemInstance);
             });
         });
     }
     function emitPage(page, model, collectionPath, labelContext, currentInstance) {
         const options = page.paths.flatMap((path) => {
-            const option = findOption(model, currentInstance, path);
-            if (option == null) {
+            const found = findOption(model, currentInstance, path);
+            if (found == null) {
                 return [];
             }
             const fullPath = [...collectionPath, ...path];
+            const [name, option] = found;
             return [
                 {
+                    name,
                     option,
                     value: readPath(currentInstance, path),
                     update: (updateInstance, updateValue) => setPath(updateInstance, fullPath, updateValue)
@@ -57,8 +61,8 @@ export function render(builder, instance, refs = []) {
     function emitDescribe(describe, model, labelContext, currentInstance) {
         const composedLabel = composeLabel(describe.label, labelContext);
         const values = describe.paths.flatMap((path) => {
-            const option = findOption(model, currentInstance, path);
-            if (option == null) {
+            const found = findOption(model, currentInstance, path);
+            if (found == null) {
                 return [];
             }
             const value = readPath(currentInstance, path);
@@ -78,6 +82,9 @@ export function render(builder, instance, refs = []) {
         if (labelContext.length === 0) {
             return resolved;
         }
+        if (resolved === '') {
+            return labelContext.join(', ');
+        }
         return `${labelContext.join(', ')}, ${resolved}`;
     }
     function findOption(model, instance, path) {
@@ -90,7 +97,14 @@ export function render(builder, instance, refs = []) {
         }
         const [scopeModel, scopeInstance] = descended;
         const entry = scopeModel.options.find((option) => option.name === optionName);
-        return entry == null ? null : resolveOption(entry, scopeInstance, refs);
+        if (entry == null) {
+            return null;
+        }
+        const optionValues = resolveOption(entry, scopeInstance, refs);
+        if (optionValues == null) {
+            return null;
+        }
+        return [entry.name, optionValues];
     }
     function descendPairs(model, instance, remaining) {
         if (remaining.length === 0) {

package/dist/validate/model.js

@@ -59,23 +59,52 @@ export function validateModelStructure(input, resolve, location) {
     const checkPaths = (entry, entryLocation) => (skipPathValidation ? [] : checkEntryPaths(modelInput, entry, entryLocation));
     options.forEach((entry, entryIndex) => errors.push(...checkPaths(entry, [...location, 'options', entryIndex])));
     components.forEach((entry, entryIndex) => errors.push(...checkPaths(entry, [...location, 'components', entryIndex])));
-    collections.forEach((entry, entryIndex) => {
+    const resolvedCollections = collections.map((entry, entryIndex) => {
         const collectionLocation = [...location, 'collections', entryIndex];
         errors.push(...checkPaths(entry, collectionLocation), ...checkCollectionBounds(entry, collectionLocation));
-        collectionNestedModels(entry, collectionLocation).forEach(([nested, nestedLocation]) => {
-            const [, nestedErrors] = validateModelStructure(nested, resolve, nestedLocation);
-            errors.push(...nestedErrors);
-        });
+        const [resolvedEntry, entryErrors] = resolveCollectionInnerModels(entry, resolve, [...collectionLocation, 'payload']);
+        errors.push(...entryErrors);
+        return resolvedEntry;
     });
     const data = {
         ...modelInput,
         models: childModels,
         options,
         components,
-        collections
+        collections: resolvedCollections
     };
     return [data, errors];
 }
+function resolveCollectionInnerModels(entry, resolve, payloadLocation) {
+    const errors = [];
+    const newPayload = mapCollectionConfigs(entry.payload, payloadLocation, (config, configLocation) => {
+        if (!check.is(BuilderModelSerialisedSchema, config.model)) {
+            return config;
+        }
+        const [validated, modelErrors] = validateModelStructure(config.model, resolve, [...configLocation, 'model']);
+        errors.push(...modelErrors);
+        return { ...config, model: validated };
+    });
+    return [{ ...entry, payload: newPayload }, errors];
+}
+function mapCollectionConfigs(payload, location, visit) {
+    if (check.is(BuilderCollectionConfigSerialisedSchema, payload)) {
+        return visit(payload, location);
+    }
+    if (!check.is(BuilderWhenSerialisedSchema, payload)) {
+        return payload;
+    }
+    const when = payload;
+    if (when.type === 'match') {
+        const selectMap = when.selectMap;
+        const newSelectMap = Object.fromEntries(Object.entries(selectMap).map(([key, value]) => [
+            key,
+            mapCollectionConfigs(value, [...location, 'selectMap', key], visit)
+        ]));
+        return { ...when, selectMap: newSelectMap };
+    }
+    return { ...when, payload: mapCollectionConfigs(when.payload, [...location, 'payload'], visit) };
+}
 function walkEntries(entries, entryKind, resolve, location) {
     const seen = new Set();
     const items = [];
@@ -130,11 +159,6 @@ function checkCollectionBounds(collection, location) {
         return [];
     });
 }
-function collectionNestedModels(collection, location) {
-    return collectionConfigs(collection, location).flatMap(([config, configLocation]) => check.is(BuilderModelSerialisedSchema, config.model)
-        ? [[config.model, [...configLocation, 'model']]]
-        : []);
-}
 function collectionConfigs(collection, location) {
     const { payload } = collection;
     const payloadLocation = [...location, 'payload'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder-builder/builder",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "type": "module",
   "exports": {
     ".": {