@almadar/core 10.8.0 → 10.10.0

package/dist/builders.d.ts

@@ -1,7 +1,7 @@
-import { T as TraitConfig, U as UISlot, E as Effect, a as Trait, R as RenderBinding, b as RenderUIEffect, c as TraitEventContract, d as Entity, e as TraitEventListener, f as EntityField, g as EntityPersistence, h as EntityRow, i as TraitRef, j as TraitReference } from './trait-DwxDJ6PP.js';
-import { O as OrbitalSchema, U as UseDeclaration, E as EntityRef, P as PageRef, a as OrbitalDefinition, b as Page, c as PageRefObject } from './schema-C3osccoR.js';
+import { T as TraitConfig, U as UISlot, E as Effect, a as Trait, R as RenderBinding, b as RenderUIEffect, c as TraitEventContract, d as Entity, e as TraitEventListener, C as CallSiteConfig, f as EntityField, g as EntityPersistence, h as EntityRow, i as TraitRef, j as TraitReference } from './trait-CKueAwP9.js';
+import { O as OrbitalSchema, U as UseDeclaration, E as EntityRef, P as PageRef, a as OrbitalDefinition, b as Page, c as PageRefObject } from './schema-C4ia6wFF.js';
 import { S as SExpr } from './expression-BUIi9ezJ.js';
-export { C as ComposeBehaviorsInput, a as ComposeBehaviorsResult, E as EventWiringEntry, L as LayoutStrategy, b as applyEventWiring, c as composeBehaviors, d as detectLayoutStrategy } from './compose-behaviors-9xDCK9IA.js';
+export { C as ComposeBehaviorsInput, a as ComposeBehaviorsResult, E as EventWiringEntry, L as LayoutStrategy, b as applyEventWiring, c as composeBehaviors, d as detectLayoutStrategy } from './compose-behaviors-CQCfFBnR.js';
 import { AnyPatternConfig } from '@almadar/patterns';
 import 'zod';
 
@@ -244,8 +244,12 @@ interface MakeTraitRefOpts {
     listens?: TraitEventListener[];
     /** Set every emit's scope. */
     emitsScope?: 'internal' | 'external';
-    /** Call-site config overrides. Matches {@link TraitReference.config}. */
-    config?: TraitConfig;
+    /**
+     * Call-site config overrides. Each entry is either a plain wiring value
+     * (`TraitConfigValue`) or a fully-annotated re-declaration
+     * (`ConfigFieldDeclaration`). Matches {@link TraitReference.config}.
+     */
+    config?: CallSiteConfig;
 }
 /**
  * Typed-narrowing variant of {@link MakeTraitRefOpts} for callers that know
@@ -260,6 +264,9 @@ interface MakeTraitRefOpts {
  *   `events` rename map's keys to legal originals only.
  * - `ConfigShape` — typed shape of the trait's `config { ... }` block (literal
  *   unions intact). Narrows the `config` override to the atom's actual fields.
+ *   Extends `CallSiteConfig` to allow both plain wiring values and annotated
+ *   declarations. Existing callers using plain `TraitConfig` shapes are
+ *   unaffected (TraitConfig ⊆ CallSiteConfig).
  * - `ListenKey`  — string union of the atom's listen-key contract. Narrows
  *   each listens entry's `event` against the atom's real subscription set.
  *
@@ -267,7 +274,7 @@ interface MakeTraitRefOpts {
  * narrow and wide forms via the standard structural-typing rules. This is
  * a type-level narrowing only; widening at the call boundary is intentional.
  */
-interface MakeTraitRefOptsTyped<EventKey extends string = string, ConfigShape extends TraitConfig = Record<string, never>, ListenKey extends string = string> extends Omit<MakeTraitRefOpts, 'events' | 'effects' | 'listens' | 'config'> {
+interface MakeTraitRefOptsTyped<EventKey extends string = string, ConfigShape extends CallSiteConfig = Record<string, never>, ListenKey extends string = string> extends Omit<MakeTraitRefOpts, 'events' | 'effects' | 'listens' | 'config'> {
     /** Per-key rename map, narrowed to the atom's actual event keys. */
     events?: Partial<Record<EventKey, string>>;
     /**
@@ -372,7 +379,7 @@ interface MakeAtomOrbitalTraitOverrides {
     effects?: Record<string, SExpr[]>;
     listens?: TraitEventListener[];
     emitsScope?: 'internal' | 'external';
-    config?: TraitConfig;
+    config?: CallSiteConfig;
 }
 /**
  * Options for {@link makeAtomOrbital}.

package/dist/builders.js

@@ -486,7 +486,11 @@ z.object({
     z.string().min(1, "fields key (canonical field name) must be non-empty"),
     z.string().min(1, "fields value (consumer field name) must be non-empty")
   ).optional(),
-  config: TraitConfigSchema.optional(),
+  // Each value is either a plain wiring value (TraitConfigValue) or an
+  // annotated ConfigFieldDeclaration. Declaration form is tried first
+  // (it's more specific — has a `"type"` string key); plain values fall
+  // through to the recursive TraitConfigValue union.
+  config: z.record(z.union([ConfigFieldDeclarationSchema, TraitConfigValueSchema])).optional(),
   appliesTo: z.array(z.string()).optional(),
   // Phase F.7: zod accepts an array (the inliner validates element
   // shape). The full ListenDefinition shape isn't recursively encoded
@@ -1198,7 +1202,8 @@ function overrideTrait(trait, values) {
     return { ...trait, config: next };
   }
   const base = trait.config !== void 0 ? { ...trait.config } : {};
-  return { ...trait, config: { ...base, ...values } };
+  const merged = { ...base, ...values };
+  return { ...trait, config: merged };
 }
 function traitIdentity(trait) {
   if (trait.name !== void 0) return trait.name;