@builder-builder/builder 0.0.4 → 0.0.5

package/dist/resolve/render.js

@@ -33,7 +33,7 @@ export function render(rootBuilder, rootModel, input) {
             }
             if (item.type === 'page') {
                 const resolvedOptions = item.paths.flatMap((path) => {
-                    const option = resolvePageOption(builder, model, path);
+                    const option = findPageOption(builder, model, path);
                     if (!option) {
                         return [];
                     }
@@ -61,7 +61,7 @@ export function render(rootBuilder, rootModel, input) {
                     return;
                 }
                 const values = item.paths.flatMap((path) => {
-                    const value = resolveOptionValue(builder, model, path);
+                    const value = findOptionValue(builder, model, path);
                     if (value === MISSING || value == null) {
                         return [];
                     }
@@ -81,65 +81,71 @@ export function ordinal(index) {
     return ordinals[index] ?? `${index + 1}`;
 }
 const MISSING = {};
-function resolvePageOption(builder, model, path) {
-    const optionName = path[path.length - 1];
-    const prefix = path.slice(0, -1);
-    let currentBuilder = builder;
-    let currentModel = model;
-    for (let pathIndex = 0; pathIndex < prefix.length; pathIndex += 2) {
-        if (!currentModel) {
-            return null;
-        }
-        const collection = findCollection(currentBuilder, currentModel, prefix[pathIndex]);
-        if (!collection) {
-            return null;
-        }
-        currentBuilder = collection.builder;
-        const collectionModels = resolveCollectionModels(model, collection.name);
-        currentModel = collectionModels[prefix[pathIndex + 1]];
-    }
-    if (!currentModel) {
+const ordinals = [
+    'First',
+    'Second',
+    'Third',
+    'Fourth',
+    'Fifth',
+    'Sixth',
+    'Seventh',
+    'Eighth',
+    'Ninth',
+    'Tenth',
+    'Eleventh',
+    'Twelfth',
+    'Thirteenth',
+    'Fourteenth',
+    'Fifteenth'
+];
+function findPageOption(builder, model, path) {
+    const resolved = walkCollectionPath(builder, model, path);
+    if (!resolved) {
         return null;
     }
-    return currentBuilder.options.reduce((found, entry) => {
+    return resolved.builder.options.reduce((found, entry) => {
         if (found) {
             return found;
         }
-        const resolved = entry.resolve(currentModel);
-        return resolved?.name === optionName ? resolved : null;
+        const option = entry.resolve(resolved.model);
+        return option?.name === resolved.optionName ? option : null;
     }, null);
 }
-function resolveOptionValue(builder, model, path) {
+function findOptionValue(builder, model, path) {
+    const resolved = walkCollectionPath(builder, model, path);
+    if (!resolved) {
+        return MISSING;
+    }
+    const hasOption = resolved.builder.options.some((entry) => {
+        const option = entry.resolve(resolved.model);
+        return option?.name === resolved.optionName;
+    });
+    if (!hasOption) {
+        return MISSING;
+    }
+    return resolved.model[resolved.optionName];
+}
+function walkCollectionPath(builder, model, path) {
     const optionName = path[path.length - 1];
-    const prefix = path.slice(0, -1);
+    const collectionPairs = path.slice(0, -1);
     let currentBuilder = builder;
     let currentModel = model;
-    for (let pathIndex = 0; pathIndex < prefix.length; pathIndex += 2) {
+    for (let pairIndex = 0; pairIndex < collectionPairs.length; pairIndex += 2) {
         if (!currentModel) {
-            return MISSING;
+            return null;
         }
-        const collection = findCollection(currentBuilder, currentModel, prefix[pathIndex]);
+        const collection = findCollection(currentBuilder, currentModel, collectionPairs[pairIndex]);
         if (!collection) {
-            return MISSING;
+            return null;
         }
         currentBuilder = collection.builder;
         const collectionModels = resolveCollectionModels(model, collection.name);
-        currentModel = collectionModels[prefix[pathIndex + 1]];
+        currentModel = collectionModels[collectionPairs[pairIndex + 1]];
     }
     if (!currentModel) {
-        return MISSING;
-    }
-    let found = false;
-    currentBuilder.options.forEach((entry) => {
-        const option = entry.resolve(currentModel);
-        if (option && option.name === optionName) {
-            found = true;
-        }
-    });
-    if (!found) {
-        return MISSING;
+        return null;
     }
-    return currentModel[optionName];
+    return { builder: currentBuilder, model: currentModel, optionName };
 }
 function findCollection(builder, model, collectionName) {
     return builder.collections.reduce((found, entry) => {
@@ -153,7 +159,7 @@ function findCollection(builder, model, collectionName) {
 function setPath(container, path, value) {
     const [head, ...tail] = path;
     if (typeof head === 'number') {
-        const arrayContainer = container ? container : [];
+        const arrayContainer = container ? [...container] : [];
         arrayContainer[head] = tail.length === 0 ? value : setPath(arrayContainer[head], tail, value);
         return arrayContainer;
     }
@@ -163,20 +169,3 @@ function setPath(container, path, value) {
         [head]: tail.length === 0 ? value : setPath(objectContainer[head], tail, value)
     };
 }
-const ordinals = [
-    'First',
-    'Second',
-    'Third',
-    'Fourth',
-    'Fifth',
-    'Sixth',
-    'Seventh',
-    'Eighth',
-    'Ninth',
-    'Tenth',
-    'Eleventh',
-    'Twelfth',
-    'Thirteenth',
-    'Fourteenth',
-    'Fifteenth'
-];

package/dist/resolve/validate.d.ts

@@ -1,4 +1,4 @@
-import type { BuilderData, BuilderModel } from '../config';
+import type { BuilderData, BuilderModel } from '../model';
 import type { BuilderGeneric } from '../core/index';
 declare const validated: unique symbol;
 export type BuilderDataValidated = BuilderData & {
@@ -25,8 +25,9 @@ export type BuilderErrorVariantInvalid = {
 export type BuilderErrorValidate = BuilderErrorComponentMissing | BuilderErrorComponentUnexpected | BuilderErrorVariantMissing | BuilderErrorVariantInvalid;
 export type BuilderErrorsValidate = ReadonlyArray<BuilderErrorValidate>;
 export type BuilderValidateResult = readonly [BuilderDataValidated, BuilderErrorsValidate];
-export declare function validate(builder: BuilderGeneric, builderModels: BuilderData): BuilderValidateResult;
-export declare namespace validate {
-    var strict: (builder: BuilderGeneric, builderModels: BuilderData) => BuilderValidateResult;
-}
+export declare const validate: typeof validateBuilder & {
+    strict: typeof validateStrict;
+};
+declare function validateBuilder(builder: BuilderGeneric, builderModels: BuilderData): BuilderValidateResult;
+declare function validateStrict(builder: BuilderGeneric, builderModels: BuilderData): BuilderValidateResult;
 export {};

package/dist/resolve/validate.js

@@ -1,5 +1,6 @@
 import { models } from './models.js';
-export function validate(builder, builderModels) {
+export const validate = Object.assign(validateBuilder, { strict: validateStrict });
+function validateBuilder(builder, builderModels) {
     const expected = models(builder);
     let errors = [];
     Object.entries(expected).forEach(([component, expectedModels]) => {
@@ -30,13 +31,13 @@ export function validate(builder, builderModels) {
     });
     return [builderModels, errors];
 }
-validate.strict = function strict(builder, builderModels) {
-    const [data, errors] = validate(builder, builderModels);
+function validateStrict(builder, builderModels) {
+    const [data, errors] = validateBuilder(builder, builderModels);
     if (errors.length > 0) {
         throw new ValidateException(errors);
     }
     return [data, []];
-};
+}
 function sortedKey(model) {
     const entries = Object.entries(model).filter(([, value]) => value != null);
     return JSON.stringify(entries.sort(([keyA], [keyB]) => keyA.localeCompare(keyB)));

package/dist/schemas/index.d.ts

@@ -1,10 +1,6 @@
 export type { BuilderDescription, BuilderDescriptionItem } from './description';
 export { BuilderDescriptionItemSchema, BuilderDescriptionSchema } from './description.js';
-export type { BuilderLayout, BuilderLayoutOption, BuilderLayoutOptions, BuilderLayoutPage } from './layout';
-export { BuilderLayoutOptionSchema, BuilderLayoutOptionsSchema, BuilderLayoutPageSchema, BuilderLayoutSchema } from './layout.js';
 export type { BuilderPath, BuilderPaths, BuilderPrimitive, BuilderPrimitives } from './primitives';
 export { BuilderPathSchema, BuilderPathsSchema, BuilderPrimitiveSchema, BuilderPrimitivesSchema } from './primitives.js';
-export type { BuilderCollectionConfigSerialised, BuilderCollectionEnableConfigSerialised, BuilderCollectionMatchConfigSerialised, BuilderCollectionSerialised, BuilderCollectionUnlessConfigSerialised, BuilderCollectionWhenConfigSerialised, BuilderComponentSerialised, BuilderOptionEnableConfigSerialised, BuilderOptionMatchConfigSerialised, BuilderOptionSerialised, BuilderOptionUnlessConfigSerialised, BuilderOptionValues, BuilderOptionValuesMap, BuilderOptionWhenConfigSerialised, BuilderSelectTypeSerialised, BuilderSerialised, BuilderToggleTypeSerialised, BuilderUICollectionSerialised, BuilderUIDescribeSerialised, BuilderUIItemSerialised, BuilderUIItemsSerialised, BuilderUIPageSerialised, BuilderUISerialised, BuilderParameterSerialised, BuilderValuesSerialised } from './serialise';
-export { BuilderCollectionConfigSerialisedSchema, BuilderCollectionEnableConfigSerialisedSchema, BuilderCollectionMatchConfigSerialisedSchema, BuilderCollectionSerialisedSchema, BuilderCollectionUnlessConfigSerialisedSchema, BuilderCollectionWhenConfigSerialisedSchema, BuilderComponentSerialisedSchema, BuilderOptionEnableConfigSerialisedSchema, BuilderOptionMatchConfigSerialisedSchema, BuilderOptionSerialisedSchema, BuilderOptionUnlessConfigSerialisedSchema, BuilderOptionValuesMapSchema, BuilderOptionValuesSchema, BuilderOptionWhenConfigSerialisedSchema, BuilderParameterSchema, BuilderSelectTypeSerialisedSchema, BuilderSerialisedSchema, BuilderToggleTypeSerialisedSchema, BuilderUICollectionSerialisedSchema, BuilderUIDescribeSerialisedSchema, BuilderUIItemSerialisedSchema, BuilderUIItemsSerialisedSchema, BuilderUIPageSerialisedSchema, BuilderValuesSerialisedSchema } from './serialise.js';
 export type { BuilderUICollection, BuilderUIDescribe, BuilderUIItem, BuilderUIItems, BuilderUIPage } from './ui';
 export { BuilderUICollectionSchema, BuilderUIDescribeSchema, BuilderUIItemSchema, BuilderUIItemsSchema, BuilderUIPageSchema } from './ui.js';

package/dist/schemas/index.js

@@ -1,5 +1,3 @@
 export { BuilderDescriptionItemSchema, BuilderDescriptionSchema } from './description.js';
-export { BuilderLayoutOptionSchema, BuilderLayoutOptionsSchema, BuilderLayoutPageSchema, BuilderLayoutSchema } from './layout.js';
 export { BuilderPathSchema, BuilderPathsSchema, BuilderPrimitiveSchema, BuilderPrimitivesSchema } from './primitives.js';
-export { BuilderCollectionConfigSerialisedSchema, BuilderCollectionEnableConfigSerialisedSchema, BuilderCollectionMatchConfigSerialisedSchema, BuilderCollectionSerialisedSchema, BuilderCollectionUnlessConfigSerialisedSchema, BuilderCollectionWhenConfigSerialisedSchema, BuilderComponentSerialisedSchema, BuilderOptionEnableConfigSerialisedSchema, BuilderOptionMatchConfigSerialisedSchema, BuilderOptionSerialisedSchema, BuilderOptionUnlessConfigSerialisedSchema, BuilderOptionValuesMapSchema, BuilderOptionValuesSchema, BuilderOptionWhenConfigSerialisedSchema, BuilderParameterSchema, BuilderSelectTypeSerialisedSchema, BuilderSerialisedSchema, BuilderToggleTypeSerialisedSchema, BuilderUICollectionSerialisedSchema, BuilderUIDescribeSerialisedSchema, BuilderUIItemSerialisedSchema, BuilderUIItemsSerialisedSchema, BuilderUIPageSerialisedSchema, BuilderValuesSerialisedSchema } from './serialise.js';
 export { BuilderUICollectionSchema, BuilderUIDescribeSchema, BuilderUIItemSchema, BuilderUIItemsSchema, BuilderUIPageSchema } from './ui.js';

package/dist/serialise/deserialise.js

@@ -1,6 +1,6 @@
 import * as v from 'valibot';
-import { BuilderCollection, BuilderComponent, BuilderOption, Builder, BuilderParameter, BuilderSelectType, BuilderToggleType } from '../core/index.js';
-import { BuilderSerialisedSchema, BuilderUIItemsSerialisedSchema } from '../schemas/index.js';
+import { BuilderCollection, BuilderComponent, BuilderExpectation, BuilderOption, Builder, BuilderParameter, BuilderSelectType, BuilderToggleType } from '../core/index.js';
+import { BuilderSerialisedSchema, BuilderUIItemsSerialisedSchema } from './schemas.js';
 import { BuilderUI } from '../ui.js';
 export const deserialise = {
     builder: deserialiseBuilder,
@@ -16,7 +16,8 @@ function buildBuilder(data) {
     const options = data.options.map(deserialiseOption);
     const components = data.components.map(deserialiseComponent);
     const collections = data.collections.map(deserialiseCollection);
-    return new Builder(options, collections, components);
+    const expectations = data.expectations.map((expectation) => new BuilderExpectation(expectation.name, expectation.kind));
+    return new Builder(options, collections, components, expectations);
 }
 function deserialiseOption(data) {
     const values = deserialiseValues(data.values);
@@ -65,14 +66,13 @@ function deserialiseOptionWhenConfig(data) {
             const { matchPath, type } = data;
             if ('type' in data.selectMap && data.selectMap.type === 'parameter') {
                 const parameter = new BuilderParameter();
-                return { type, matchPath, selectMap: parameter, values: parameter };
+                return { type, matchPath, selectMap: parameter };
             }
             const selectMap = Object.fromEntries(Object.entries(data.selectMap).map(([key, value]) => [
                 key,
                 value ? deserialiseValues(value) : null
             ]));
-            const values = Object.values(selectMap).find((value) => value !== null);
-            return { type, matchPath, selectMap, values };
+            return { type, matchPath, selectMap };
         }
         case 'unless': {
             const { type, unlessPath, disabledValues } = data;

package/dist/serialise/index.d.ts

@@ -1,4 +1,4 @@
-export type { BuilderCollectionSerialised, BuilderCollectionConfigSerialised, BuilderCollectionEnableConfigSerialised, BuilderCollectionMatchConfigSerialised, BuilderCollectionUnlessConfigSerialised, BuilderCollectionWhenConfigSerialised, BuilderComponentSerialised, BuilderOptionSerialised, BuilderOptionEnableConfigSerialised, BuilderOptionMatchConfigSerialised, BuilderOptionUnlessConfigSerialised, BuilderOptionWhenConfigSerialised, BuilderSerialised, BuilderSelectTypeSerialised, BuilderToggleTypeSerialised, BuilderUISerialised, BuilderUICollectionSerialised, BuilderUIDescribeSerialised, BuilderUIItemSerialised, BuilderUIItemsSerialised, BuilderUIPageSerialised, BuilderValuesSerialised } from '../schemas/index';
-export { BuilderCollectionConfigSerialisedSchema, BuilderCollectionEnableConfigSerialisedSchema, BuilderCollectionMatchConfigSerialisedSchema, BuilderCollectionSerialisedSchema, BuilderCollectionUnlessConfigSerialisedSchema, BuilderCollectionWhenConfigSerialisedSchema, BuilderComponentSerialisedSchema, BuilderOptionEnableConfigSerialisedSchema, BuilderOptionMatchConfigSerialisedSchema, BuilderOptionSerialisedSchema, BuilderOptionUnlessConfigSerialisedSchema, BuilderOptionWhenConfigSerialisedSchema, BuilderSerialisedSchema, BuilderSelectTypeSerialisedSchema, BuilderToggleTypeSerialisedSchema, BuilderUICollectionSerialisedSchema, BuilderUIDescribeSerialisedSchema, BuilderUIItemSerialisedSchema, BuilderUIItemsSerialisedSchema, BuilderUIPageSerialisedSchema, BuilderValuesSerialisedSchema } from '../schemas/index.js';
+export type { BuilderCollectionSerialised, BuilderCollectionConfigSerialised, BuilderCollectionEnableConfigSerialised, BuilderCollectionMatchConfigSerialised, BuilderCollectionUnlessConfigSerialised, BuilderCollectionWhenConfigSerialised, BuilderComponentSerialised, BuilderExpectationSerialised, BuilderOptionSerialised, BuilderOptionEnableConfigSerialised, BuilderOptionMatchConfigSerialised, BuilderOptionUnlessConfigSerialised, BuilderOptionWhenConfigSerialised, BuilderSerialised, BuilderSelectTypeSerialised, BuilderToggleTypeSerialised, BuilderUISerialised, BuilderUICollectionSerialised, BuilderUIDescribeSerialised, BuilderUIItemSerialised, BuilderUIItemsSerialised, BuilderUIPageSerialised, BuilderParameterSerialised, BuilderValuesSerialised } from './schemas';
+export { BuilderCollectionConfigSerialisedSchema, BuilderCollectionEnableConfigSerialisedSchema, BuilderCollectionMatchConfigSerialisedSchema, BuilderCollectionSerialisedSchema, BuilderCollectionUnlessConfigSerialisedSchema, BuilderCollectionWhenConfigSerialisedSchema, BuilderComponentSerialisedSchema, BuilderExpectationSerialisedSchema, BuilderOptionEnableConfigSerialisedSchema, BuilderOptionMatchConfigSerialisedSchema, BuilderOptionSerialisedSchema, BuilderOptionUnlessConfigSerialisedSchema, BuilderOptionWhenConfigSerialisedSchema, BuilderSerialisedSchema, BuilderSelectTypeSerialisedSchema, BuilderToggleTypeSerialisedSchema, BuilderUICollectionSerialisedSchema, BuilderUIDescribeSerialisedSchema, BuilderUIItemSerialisedSchema, BuilderUIItemsSerialisedSchema, BuilderUIPageSerialisedSchema, BuilderValuesSerialisedSchema } from './schemas.js';
 export { deserialise } from './deserialise.js';
 export { serialise } from './serialise.js';

package/dist/serialise/index.js

@@ -1,3 +1,3 @@
-export { BuilderCollectionConfigSerialisedSchema, BuilderCollectionEnableConfigSerialisedSchema, BuilderCollectionMatchConfigSerialisedSchema, BuilderCollectionSerialisedSchema, BuilderCollectionUnlessConfigSerialisedSchema, BuilderCollectionWhenConfigSerialisedSchema, BuilderComponentSerialisedSchema, BuilderOptionEnableConfigSerialisedSchema, BuilderOptionMatchConfigSerialisedSchema, BuilderOptionSerialisedSchema, BuilderOptionUnlessConfigSerialisedSchema, BuilderOptionWhenConfigSerialisedSchema, BuilderSerialisedSchema, BuilderSelectTypeSerialisedSchema, BuilderToggleTypeSerialisedSchema, BuilderUICollectionSerialisedSchema, BuilderUIDescribeSerialisedSchema, BuilderUIItemSerialisedSchema, BuilderUIItemsSerialisedSchema, BuilderUIPageSerialisedSchema, BuilderValuesSerialisedSchema } from '../schemas/index.js';
+export { BuilderCollectionConfigSerialisedSchema, BuilderCollectionEnableConfigSerialisedSchema, BuilderCollectionMatchConfigSerialisedSchema, BuilderCollectionSerialisedSchema, BuilderCollectionUnlessConfigSerialisedSchema, BuilderCollectionWhenConfigSerialisedSchema, BuilderComponentSerialisedSchema, BuilderExpectationSerialisedSchema, BuilderOptionEnableConfigSerialisedSchema, BuilderOptionMatchConfigSerialisedSchema, BuilderOptionSerialisedSchema, BuilderOptionUnlessConfigSerialisedSchema, BuilderOptionWhenConfigSerialisedSchema, BuilderSerialisedSchema, BuilderSelectTypeSerialisedSchema, BuilderToggleTypeSerialisedSchema, BuilderUICollectionSerialisedSchema, BuilderUIDescribeSerialisedSchema, BuilderUIItemSerialisedSchema, BuilderUIItemsSerialisedSchema, BuilderUIPageSerialisedSchema, BuilderValuesSerialisedSchema } from './schemas.js';
 export { deserialise } from './deserialise.js';
 export { serialise } from './serialise.js';