@builder-builder/builder 0.0.27 → 0.0.28

package/dist/validate/ui.js

@@ -1,23 +1,23 @@
 import { BuilderModelSerialisedSchema, BuilderPathSchema, BuilderUIInputMetadataSchema, BuilderUIInputSerialisedSchema, BuilderUIInputsSerialisedSchema, BuilderUIItemSerialisedSchema, BuilderUIItemsSerialisedSchema, BuilderUISerialisedSchema, modelsMerge, serialise, uis, validateUIDescribe, validateUIInput, validateUIPage, validateUIPages } from '../entities/index.js';
-import { BuilderErrorsScope, check } from '../errors/index.js';
+import { BuilderIssuesScope, check } from '../errors/index.js';
 import { resolveCollections } from '../mappers/index.js';
 import { StringSchema } from '../primitive.js';
 import { validate } from './brand.js';
 import { checkExpectations } from './expectations.js';
 import { checkPath } from './paths.js';
 import { resolver } from './resolve.js';
-export function validateUI(input, references = [], errors = new BuilderErrorsScope(input)) {
+export function validateUI(input, references = [], issues = new BuilderIssuesScope(input)) {
     if (!check.is(BuilderUISerialisedSchema, input)) {
-        errors.entityInvalid('ui');
-        return [validate(serialise.ui(uis())), errors.errors];
+        issues.entityInvalid('ui');
+        return [validate(serialise.ui(uis())), issues.errors, issues.warnings];
     }
-    const resolve = resolver(errors, references);
-    const structure = validateUIStructure(input, resolve, errors);
-    return [validate(structure), errors.errors];
+    const resolve = resolver(issues, references);
+    const structure = validateUIStructure(input, resolve, issues);
+    return [validate(structure), issues.errors, issues.warnings];
 }
-export function validateUIStructure(ui, resolve, errors) {
+export function validateUIStructure(ui, resolve, issues) {
     const childUIs = walkChildUIs();
-    const items = errors.scope('items', () => walkItems(ui.items));
+    const items = issues.scope('items', () => walkItems(ui.items));
     const data = {
         ...ui,
         uis: childUIs,
@@ -25,40 +25,40 @@ export function validateUIStructure(ui, resolve, errors) {
     };
     return data;
     function walkChildUIs() {
-        return errors.scope('uis', () => ui.uis.flatMap((part, partIndex) => errors.scope(partIndex, () => {
+        return issues.scope('uis', () => ui.uis.flatMap((part, partIndex) => issues.scope(partIndex, () => {
             const resolved = resolve(part, BuilderUISerialisedSchema);
             if (resolved == null) {
                 return [];
             }
-            return [validateUIStructure(resolved, resolve, errors)];
+            return [validateUIStructure(resolved, resolve, issues)];
         })));
     }
     function walkItems(parts) {
-        return parts.map((item, itemIndex) => errors.scope(itemIndex, () => {
+        return parts.map((item, itemIndex) => issues.scope(itemIndex, () => {
             const resolved = resolve(item, BuilderUIItemSerialisedSchema);
             return walkUIItem((resolved ?? item));
         }));
     }
     function walkUIItem(item) {
         if (item.type === 'page') {
-            validateUIPage(item, [], errors);
+            validateUIPage(item, [], issues);
         }
         else if (item.type === 'pages') {
-            validateUIPages(item, [], errors);
+            validateUIPages(item, [], issues);
         }
         else if (item.type === 'describe') {
-            validateUIDescribe(item, [], errors);
+            validateUIDescribe(item, [], issues);
         }
-        const label = errors.scope('label', () => resolve(item.label, StringSchema) ?? item.label);
+        const label = issues.scope('label', () => resolve(item.label, StringSchema) ?? item.label);
         if (item.type === 'pages') {
-            const innerItems = errors.scope('items', () => {
+            const innerItems = issues.scope('items', () => {
                 const resolved = resolve(item.items, BuilderUIItemsSerialisedSchema);
                 const resolvedItems = (Array.isArray(resolved) ? resolved : item.items);
                 return walkItems(resolvedItems);
             });
             return { ...item, label, items: innerItems };
         }
-        const inputs = errors.scope('inputs', () => {
+        const inputs = issues.scope('inputs', () => {
             const resolved = resolve(item.inputs, BuilderUIInputsSerialisedSchema);
             if (!Array.isArray(resolved)) {
                 return resolved ?? item.inputs;
@@ -68,18 +68,18 @@ export function validateUIStructure(ui, resolve, errors) {
         return { ...item, label, inputs };
     }
     function walkInputs(inputs) {
-        return inputs.map((entry, entryIndex) => errors.scope(entryIndex, () => {
+        return inputs.map((entry, entryIndex) => issues.scope(entryIndex, () => {
             const resolvedEntry = resolve(entry, BuilderUIInputSerialisedSchema);
             return walkInput((resolvedEntry ?? entry));
         }));
     }
     function walkInput(value) {
-        validateUIInput(value, [], errors);
-        const path = errors.scope('path', () => resolve(value.path, BuilderPathSchema) ?? value.path);
+        validateUIInput(value, [], issues);
+        const path = issues.scope('path', () => resolve(value.path, BuilderPathSchema) ?? value.path);
         const displayName = value.displayName &&
-            errors.scope('displayName', () => resolve(value.displayName, StringSchema) ?? value.displayName);
-        const kind = value.kind && errors.scope('kind', () => resolve(value.kind, StringSchema) ?? value.kind);
-        const metadata = value.metadata && errors.scope('metadata', () => walkMetadata(value.metadata));
+            issues.scope('displayName', () => resolve(value.displayName, StringSchema) ?? value.displayName);
+        const kind = value.kind && issues.scope('kind', () => resolve(value.kind, StringSchema) ?? value.kind);
+        const metadata = value.metadata && issues.scope('metadata', () => walkMetadata(value.metadata));
         return { ...value, path, displayName, kind, metadata };
     }
     function walkMetadata(rawMetadata) {
@@ -88,28 +88,28 @@ export function validateUIStructure(ui, resolve, errors) {
             return rawMetadata;
         }
         return Object.entries(resolved).reduce((entries, [key, entryValue]) => {
-            const resolvedValue = errors.scope(key, () => resolve(entryValue));
+            const resolvedValue = issues.scope(key, () => resolve(entryValue));
             return { ...entries, [key]: resolvedValue ?? entryValue };
         }, {});
     }
 }
-export function checkUIExpectations(mergedModel, ui, errors) {
+export function checkUIExpectations(mergedModel, ui, issues) {
     const expectedOptionNames = collectExpectedOptionNames(ui);
-    errors.scope('expectations', () => {
-        checkExpectations(mergedModel, ui.expectations, errors);
+    issues.scope('expectations', () => {
+        checkExpectations(mergedModel, ui.expectations, issues);
     });
-    errors.scope('items', () => walkItems(mergedModel, ui.items));
-    errors.scope('uis', () => {
+    issues.scope('items', () => walkItems(mergedModel, ui.items));
+    issues.scope('uis', () => {
         ui.uis.forEach((nested, nestedIndex) => {
-            errors.scope(nestedIndex, () => {
-                checkUIExpectations(mergedModel, nested, errors);
+            issues.scope(nestedIndex, () => {
+                checkUIExpectations(mergedModel, nested, issues);
             });
         });
     });
     function walkItems(model, items) {
         items.forEach((entry, itemIndex) => {
             const item = entry;
-            errors.scope(itemIndex, () => {
+            issues.scope(itemIndex, () => {
                 if (item.type === 'pages') {
                     walkPages(model, item);
                     return;
@@ -118,8 +118,8 @@ export function checkUIExpectations(mergedModel, ui, errors) {
                 if (!Array.isArray(inputs)) {
                     return;
                 }
-                errors.scope('inputs', () => inputs.forEach((input, entryIndex) => {
-                    errors.scope(entryIndex, () => walkInput(model, input));
+                issues.scope('inputs', () => inputs.forEach((input, entryIndex) => {
+                    issues.scope(entryIndex, () => walkInput(model, input));
                 }));
             });
         });
@@ -132,7 +132,7 @@ export function checkUIExpectations(mergedModel, ui, errors) {
         const innerModels = resolveCollections(collection).flatMap(({ model: configModel }) => check.is(BuilderModelSerialisedSchema, configModel) ? [configModel] : []);
         innerModels.forEach((innerModel) => {
             const mergedInnerModel = modelsMerge(innerModel);
-            errors.scope('items', () => walkItems(mergedInnerModel, pages.items));
+            issues.scope('items', () => walkItems(mergedInnerModel, pages.items));
         });
     }
     function walkInput(model, input) {
@@ -144,8 +144,8 @@ export function checkUIExpectations(mergedModel, ui, errors) {
         if (typeof leaf === 'string' && expectedOptionNames.has(leaf)) {
             return;
         }
-        errors.scope('path', () => {
-            checkPath(model, path, errors);
+        issues.scope('path', () => {
+            checkPath(model, path, issues);
         });
     }
 }

package/dist/validate/variants.d.ts

@@ -1,7 +1,7 @@
-import type { BuilderModelValidated, BuilderVariantsValidated, ValidationResult } from '../entities/index';
-import { BuilderErrorsScope } from '../errors/index.js';
+import type { BuilderModelValidated, BuilderReferences, BuilderVariantsValidated, ValidationResult } from '../entities/index';
+import { BuilderIssuesScope } from '../errors/index.js';
 export type BuilderVariantsValidationOptions = {
     readonly partial?: boolean;
 };
 export type BuilderVariantsValidationResult = ValidationResult<BuilderVariantsValidated>;
-export declare function validateVariants(model: BuilderModelValidated, input: unknown, options?: BuilderVariantsValidationOptions, errors?: BuilderErrorsScope): BuilderVariantsValidationResult;
+export declare function validateVariants(model: BuilderModelValidated, input: unknown, options?: BuilderVariantsValidationOptions, references?: BuilderReferences, issues?: BuilderIssuesScope): BuilderVariantsValidationResult;

package/dist/validate/variants.js

@@ -1,46 +1,46 @@
 import { BuilderComponentConfigSerialisedSchema, detailValueSchema } from '../entities/index.js';
-import { BuilderErrorsScope, check } from '../errors/index.js';
+import { BuilderIssuesScope, check } from '../errors/index.js';
 import { BuilderVariantsSchema } from '../instance.js';
 import { createVariants } from '../mappers/index.js';
 import { validate } from './brand.js';
-export function validateVariants(model, input, options = {}, errors = new BuilderErrorsScope(input)) {
+export function validateVariants(model, input, options = {}, references = [], issues = new BuilderIssuesScope(input)) {
     if (!check.is(BuilderVariantsSchema, input)) {
-        errors.variantsInvalid();
-        return [validate({}), errors.errors];
+        issues.variantsInvalid();
+        return [validate({}), issues.errors, issues.warnings];
     }
     const variants = input;
-    const expected = createVariants(model);
+    const expected = createVariants(model, references);
     if (Object.keys(expected).length === 0) {
-        errors.modelEmptyComponents();
-        return [validate({}), errors.errors];
+        issues.modelEmptyComponents();
+        return [validate({}), issues.errors, issues.warnings];
     }
-    errors.scope('variants', () => {
+    issues.scope('variants', () => {
         checkVariants();
         checkComponents();
         checkDetails();
         function checkVariants() {
             Object.entries(expected).forEach(([component, expectedVariants]) => {
                 const componentVariants = variants[component];
-                errors.scope(component, () => {
+                issues.scope(component, () => {
                     if (componentVariants == null) {
                         if (options.partial !== false) {
-                            errors.variantsMissingComponent();
+                            issues.variantsMissingComponent();
                         }
                         return;
                     }
                     const expectedKeys = new Map(expectedVariants.map(({ instance }) => [sortedKey(instance), instance]));
                     const actualKeys = new Set(componentVariants.map(({ instance }) => sortedKey(instance)));
                     componentVariants.forEach((variant, index) => {
-                        errors.scope(index, () => {
+                        issues.scope(index, () => {
                             const { instance } = variant;
                             if (!expectedKeys.has(sortedKey(instance))) {
-                                errors.variantsInvalidVariant();
+                                issues.variantsInvalidVariant();
                             }
                         });
                     });
                     Array.from(expectedKeys).forEach(([key, instance]) => {
                         if (!actualKeys.has(key)) {
-                            errors.variantsMissingVariant(instance);
+                            issues.variantsMissingVariant(instance);
                         }
                     });
                 });
@@ -48,9 +48,9 @@ export function validateVariants(model, input, options = {}, errors = new Builde
         }
         function checkComponents() {
             Object.keys(variants).forEach((component) => {
-                errors.scope(component, () => {
+                issues.scope(component, () => {
                     if (expected[component] == null) {
-                        errors.variantsUnexpectedComponent();
+                        issues.variantsUnexpectedComponent();
                     }
                 });
             });
@@ -58,32 +58,33 @@ export function validateVariants(model, input, options = {}, errors = new Builde
         function checkDetails() {
             const componentByName = new Map(model.components.map((entry) => [entry.name, entry]));
             Object.entries(variants).forEach(([component, componentVariants]) => {
-                errors.scope(component, () => {
+                issues.scope(component, () => {
                     const entry = componentByName.get(component);
                     if (entry == null) {
                         return;
                     }
                     componentVariants.forEach(({ instance, details = {} }, index) => {
-                        errors.scope(index, () => {
+                        issues.scope(index, () => {
                             const resolved = variantDetails(entry, instance);
-                            const fields = resolved?.fields ?? [];
-                            const expectedNames = new Set(fields.map(({ name }) => name));
-                            errors.scope('details', () => {
-                                fields.forEach(({ name, valueType, isOptional }) => {
-                                    errors.scope(name, () => {
-                                        if (!(name in details)) {
-                                            errors.variantsMissingDetail();
+                            const expected = resolved?.details ?? [];
+                            const expectedNames = new Set(expected.map(({ name }) => name));
+                            issues.scope('details', () => {
+                                expected.forEach(({ name, kind, isOptional }) => {
+                                    issues.scope(name, () => {
+                                        const detail = details[name];
+                                        if (detail == null) {
+                                            issues.variantsMissingDetail();
                                             return;
                                         }
-                                        if (!check.is(detailValueSchema(valueType, isOptional), details[name])) {
-                                            errors.variantsInvalidDetail();
+                                        if (!check.is(detailValueSchema(kind, isOptional), detail.value)) {
+                                            issues.variantsInvalidDetail();
                                         }
                                     });
                                 });
-                                Object.keys(details).forEach((detail) => {
-                                    if (!expectedNames.has(detail)) {
-                                        errors.scope(detail, () => {
-                                            errors.variantsUnexpectedDetail();
+                                Object.keys(details).forEach((name) => {
+                                    if (!expectedNames.has(name)) {
+                                        issues.scope(name, () => {
+                                            issues.variantsUnexpectedDetail();
                                         });
                                     }
                                 });
@@ -94,7 +95,7 @@ export function validateVariants(model, input, options = {}, errors = new Builde
             });
         }
     });
-    return [validate(variants), errors.errors];
+    return [validate(variants), issues.errors, issues.warnings];
 }
 function variantDetails(component, variantInstance) {
     const { payload } = component;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder-builder/builder",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "type": "module",
   "engines": {
     "node": ">=24"
@@ -24,6 +24,8 @@
   ],
   "svelte": "./dist/public.js",
   "types": "./dist/public.d.ts",
+  "unpkg": "./dist/components/index.min.js",
+  "jsdelivr": "./dist/components/index.min.js",
   "publishConfig": {
     "access": "public"
   },
@@ -34,7 +36,7 @@
     "build": "NODE_ENV=production vite build",
     "package": "svelte-kit sync && npm run package:lib && npm run package:components",
     "package:lib": "svelte-package --input src/lib/builder",
-    "package:components": "vite build --mode components && rm -f dist/components/*.svelte",
+    "package:components": "NODE_ENV=production vite build --mode components && rm -f dist/components/*.svelte",
     "preview": "vite preview",
     "prepare": "svelte-kit sync && npm run messages || echo ''",
     "prepublishOnly": "npm run test && npm run package",

package/dist/entities/component/field.d.ts

@@ -1,59 +0,0 @@
-import type { BuilderPrimitive } from '../../primitive';
-import type { BuilderTags } from '../tags';
-import * as v from 'valibot';
-export declare const BuilderComponentFieldValueTypeSchema: v.PicklistSchema<["string", "boolean", "number"], undefined>;
-export type BuilderComponentFieldValueType = v.InferOutput<typeof BuilderComponentFieldValueTypeSchema>;
-export declare class BuilderComponentField<const Name extends string = string, const ValueSchema extends v.GenericSchema<BuilderPrimitive> = v.GenericSchema<BuilderPrimitive>> {
-    #private;
-    readonly value: v.InferOutput<ValueSchema>;
-    readonly type: "component-field";
-    readonly name: Name;
-    readonly valueType: BuilderComponentFieldValueType;
-    readonly valueSchema: ValueSchema;
-    readonly isOptional: boolean;
-    readonly tags?: BuilderTags;
-    constructor(name: Name, valueType: BuilderComponentFieldValueType, optional?: boolean, tags?: BuilderTags);
-    optional(): BuilderComponentField<Name, v.NullableSchema<ValueSchema, undefined>>;
-    tag(...tags: Array<string>): BuilderComponentField<Name, ValueSchema>;
-}
-export declare function detailString<const Name extends string>(name: Name): BuilderComponentField<Name, v.StringSchema<undefined>>;
-export declare function detailNumber<const Name extends string>(name: Name): BuilderComponentField<Name, v.NumberSchema<undefined>>;
-export declare function detailBoolean<const Name extends string>(name: Name): BuilderComponentField<Name, v.BooleanSchema<undefined>>;
-export declare const BuilderComponentFieldSchema: v.InstanceSchema<typeof BuilderComponentField, undefined>;
-export declare const BuilderComponentFieldsSchema: v.SchemaWithPipe<readonly [v.ArraySchema<v.InstanceSchema<typeof BuilderComponentField, undefined>, undefined>, v.ReadonlyAction<BuilderComponentField<string, v.GenericSchema<string | number | boolean | null>>[]>]>;
-export type BuilderComponentFields = v.InferOutput<typeof BuilderComponentFieldsSchema>;
-export declare const BuilderComponentFieldSerialisedSchema: v.SchemaWithPipe<readonly [v.ObjectSchema<{
-    readonly type: v.LiteralSchema<"component-field", undefined>;
-    readonly name: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.MinLengthAction<string, 1, undefined>]>;
-    readonly valueType: v.PicklistSchema<["string", "boolean", "number"], 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: "component-field";
-    name: string;
-    valueType: "string" | "number" | "boolean";
-    isOptional: boolean;
-    tags?: readonly string[] | undefined;
-}>]>;
-export type BuilderComponentFieldSerialised = v.InferOutput<typeof BuilderComponentFieldSerialisedSchema>;
-export declare const BuilderComponentFieldsSerialisedSchema: v.SchemaWithPipe<readonly [v.ArraySchema<v.SchemaWithPipe<readonly [v.ObjectSchema<{
-    readonly type: v.LiteralSchema<"component-field", undefined>;
-    readonly name: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.MinLengthAction<string, 1, undefined>]>;
-    readonly valueType: v.PicklistSchema<["string", "boolean", "number"], 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: "component-field";
-    name: string;
-    valueType: "string" | "number" | "boolean";
-    isOptional: boolean;
-    tags?: readonly string[] | undefined;
-}>]>, undefined>, v.ReadonlyAction<Readonly<{
-    type: "component-field";
-    name: string;
-    valueType: "string" | "number" | "boolean";
-    isOptional: boolean;
-    tags?: readonly string[] | undefined;
-}>[]>]>;
-export type BuilderComponentFieldsSerialised = v.InferOutput<typeof BuilderComponentFieldsSerialisedSchema>;
-export declare function detailValueSchema(valueType: BuilderComponentFieldValueType, optional: boolean): v.GenericSchema<BuilderPrimitive>;

package/dist/entities/component/field.js

@@ -1,52 +0,0 @@
-import * as v from 'valibot';
-import { BooleanSchema, NameSchema, NumberSchema, StringSchema } from '../../primitive.js';
-import { serialisable } from '../serialisable.js';
-import { BuilderTagsSchema } from '../tags.js';
-export const BuilderComponentFieldValueTypeSchema = v.picklist(['string', 'boolean', 'number']);
-export class BuilderComponentField {
-    type = 'component-field';
-    name;
-    valueType;
-    valueSchema;
-    isOptional;
-    tags;
-    constructor(name, valueType, optional = false, tags) {
-        this.name = name;
-        this.valueType = valueType;
-        this.valueSchema = detailValueSchema(valueType, optional);
-        this.isOptional = optional;
-        this.tags = tags;
-    }
-    #next(patch) {
-        return new BuilderComponentField(this.name, this.valueType, patch.optional ?? this.isOptional, patch.tags ?? this.tags);
-    }
-    optional() {
-        return this.#next({ optional: true });
-    }
-    tag(...tags) {
-        return this.#next({ tags });
-    }
-}
-export function detailString(name) {
-    return new BuilderComponentField(name, 'string');
-}
-export function detailNumber(name) {
-    return new BuilderComponentField(name, 'number');
-}
-export function detailBoolean(name) {
-    return new BuilderComponentField(name, 'boolean');
-}
-export const BuilderComponentFieldSchema = v.instance(BuilderComponentField);
-export const BuilderComponentFieldsSchema = v.pipe(v.array(BuilderComponentFieldSchema), v.readonly());
-export const BuilderComponentFieldSerialisedSchema = serialisable(v.object({
-    type: v.literal('component-field'),
-    name: NameSchema,
-    valueType: BuilderComponentFieldValueTypeSchema,
-    isOptional: BooleanSchema,
-    tags: v.optional(BuilderTagsSchema)
-}));
-export const BuilderComponentFieldsSerialisedSchema = v.pipe(v.array(BuilderComponentFieldSerialisedSchema), v.readonly());
-export function detailValueSchema(valueType, optional) {
-    const baseSchema = valueType === 'string' ? StringSchema : valueType === 'boolean' ? BooleanSchema : NumberSchema;
-    return optional ? v.nullable(baseSchema) : baseSchema;
-}