@almadar/core 10.85.0 → 10.87.0

package/dist/builders.d.ts

@@ -1,8 +1,9 @@
-import { I as IdentityLedger, A as AnyPatternConfig, U as UISlot, c as Effect, h as RenderBinding, i as RenderUIEffect, d as EntityId, e as Entity, E as EntityField, a as EntityPersistence, f as EntityRow } from './effect-BgDiw_bG.js';
-import { a as OrbitalDefinition, O as OrbitalSchema, U as UseDeclaration, E as EntityRef, b as ExpectDeclaration, P as PageRef, c as Page, d as PageRefObject } from './schema-BhfQb1oe.js';
-import { b as TraitConfig, h as Trait, T as TraitEventListener, i as CallSiteConfig, k as TraitEventContract, d as TraitRef, a as TraitReference } from './trait-pavNlGqm.js';
-import { S as SExpr } from './expression-Fk8bQWef.js';
+import { I as IdentityLedger, A as AnyPatternConfig, U as UISlot, c as Effect, i as RenderBinding, j as RenderUIEffect, d as EntityId, e as Entity, E as EntityField, a as EntityPersistence, g as EntityRow } from './effect-DMA97JxX.js';
+import { a as OrbitalDefinition, O as OrbitalSchema, U as UseDeclaration, E as EntityRef, b as ExpectDeclaration, P as PageRef, c as Page, d as PageRefObject } from './schema-_SPrm5Ic.js';
+import { b as TraitConfig, h as Trait, T as TraitEventListener, i as CallSiteConfig, k as TraitEventContract, d as TraitRef, a as TraitReference } from './trait-9tfq2tQb.js';
+import { S as SExpr } from './expression-WfTp2arD.js';
 import 'zod';
+import './json-D8gmyK3l.js';
 
 /**
  * Event Wiring

package/dist/builders.js

@@ -419,6 +419,9 @@ var EntityPersistenceSchema = z.enum([
 ]);
 var OrbitalEntitySchema = z.object({
   name: z.string().min(1, "Entity name is required"),
+  // V4 arena id (`EntityDefinition.id`); declared so the strip-mode zod gate
+  // carries an imported entity's id through instead of erasing it.
+  id: EntityIdSchema.optional(),
   persistence: EntityPersistenceSchema.default("persistent"),
   shared: z.boolean().optional(),
   // Must stay in step with the Rust serde field (`EntityDefinition.identity`,
@@ -507,7 +510,8 @@ var PayloadFieldSchema = z.object({
   type: z.string().min(1),
   required: z.boolean().optional(),
   properties: z.lazy(() => z.array(PayloadFieldSchema)).optional(),
-  typeWhen: z.array(PayloadTypeWhenSchema).optional()
+  typeWhen: z.array(PayloadTypeWhenSchema).optional(),
+  entity: z.string().min(1).optional()
 });
 var EventSchema = z.object({
   key: z.string().min(1, "Event key is required"),
@@ -575,7 +579,8 @@ var ConfigFieldDeclarationSchema = z.object({
   values: z.array(z.string()).optional(),
   synonyms: z.string().optional(),
   items: ConfigFieldItemsDeclarationSchema.optional(),
-  properties: z.lazy(() => z.record(TraitEntityFieldSchema)).optional()
+  properties: z.lazy(() => z.record(TraitEntityFieldSchema)).optional(),
+  forwardedFrom: z.string().optional()
 });
 var DeclaredTraitConfigSchema = z.record(
   ConfigFieldDeclarationSchema
@@ -597,31 +602,32 @@ var TraitCategorySchema = z.enum([
   "game-board",
   "game-puzzle"
 ]);
+var TRAIT_FIELD_TYPES = [
+  "string",
+  "number",
+  "boolean",
+  "date",
+  "array",
+  "object",
+  "timestamp",
+  "datetime",
+  "enum",
+  "email",
+  "url",
+  "phone",
+  "uuid",
+  "image",
+  "trait",
+  "slot",
+  "pattern",
+  "node",
+  "event",
+  "scalar",
+  "union"
+];
 var TraitEntityFieldSchema = z.object({
   name: z.string().min(1),
-  type: z.enum([
-    "string",
-    "number",
-    "boolean",
-    "date",
-    "array",
-    "object",
-    "timestamp",
-    "datetime",
-    "enum",
-    "email",
-    "url",
-    "phone",
-    "uuid",
-    "image",
-    "trait",
-    "slot",
-    "pattern",
-    // `node` was missing here while being a real `TraitFieldType` member
-    // — the same latent-drift trap `event` would otherwise repeat.
-    "node",
-    "event"
-  ]),
+  type: z.enum(TRAIT_FIELD_TYPES),
   required: z.boolean().optional(),
   default: TraitConfigValueSchema.optional(),
   values: z.array(z.string()).optional(),
@@ -676,7 +682,7 @@ var EventPayloadFieldSchema = z.object({
   type: z.string().min(1),
   required: z.boolean().optional(),
   description: z.string().optional(),
-  entityType: z.string().optional(),
+  entity: z.string().optional(),
   properties: z.lazy(() => z.array(EventPayloadFieldSchema)).optional(),
   typeWhen: z.array(PayloadTypeWhenSchema).optional()
 });
@@ -733,8 +739,7 @@ var TraitEventListenerSchema = z.object({
 });
 var RequiredFieldSchema = z.object({
   name: z.string().min(1),
-  // `node` was missing here too (same drift as TraitEntityFieldSchema above).
-  type: z.enum(["string", "number", "boolean", "date", "array", "object", "timestamp", "datetime", "enum", "email", "url", "phone", "uuid", "image", "trait", "slot", "pattern", "node", "event"]),
+  type: z.enum(TRAIT_FIELD_TYPES),
   description: z.string().optional()
 });
 var TraitReferenceSchema = z.object({
@@ -753,6 +758,7 @@ var TraitReferenceSchema = z.object({
     z.string().min(1, "events value (caller event name) must be non-empty")
   ).optional(),
   eventIds: z.record(z.string().min(1), EventIdSchema).optional(),
+  _resolved: z.lazy(() => TraitSchema).optional(),
   // 3-II type-parameter arguments (see `TraitReference.typeArgs`).
   typeArgs: z.record(
     z.string().min(1, "typeArgs key (declared param name) must be non-empty"),
@@ -1374,7 +1380,8 @@ var UseDeclarationSchema = z.object({
   as: z.string().min(1, "Alias is required").regex(
     /^[A-Z][a-zA-Z0-9]*$/,
     'Alias must be PascalCase (e.g., "Health", "GameCore")'
-  )
+  ),
+  config: DeclaredTraitConfigSchema.optional()
 });
 var ExpectDeclarationSchema = z.discriminatedUnion("kind", [
   z.object({
@@ -1457,6 +1464,25 @@ var PageRefSchema = z.union([
   PageRefStringSchema,
   PageRefObjectSchema
 ]);
+var OrbitalRefStringSchema = z.string().regex(
+  /^[A-Z][a-zA-Z0-9]*\.orbitals\.[A-Z][a-zA-Z0-9]*$/,
+  'Orbital reference must be "Alias.orbitals.OrbitalName"'
+);
+var OrbitalRefObjectSchema = z.object({
+  ref: OrbitalRefStringSchema,
+  refId: OrbitalIdSchema.optional(),
+  entity: z.string().optional(),
+  fields: z.record(z.string()).optional(),
+  pages: z.record(z.string()).optional(),
+  omit: z.array(z.string()).optional(),
+  only: z.array(z.string()).optional(),
+  config: DeclaredTraitConfigSchema.optional(),
+  events: z.record(z.string()).optional(),
+  roles: z.record(z.string(), z.array(z.string())).optional(),
+  entities: z.record(z.string(), z.string()).optional(),
+  mounts: z.record(z.string(), z.array(z.string())).optional(),
+  extend: z.array(EntityFieldSchema).optional()
+});
 z.string().regex(
   /^([A-Z][a-zA-Z0-9]*\.traits\.)?[A-Z][a-zA-Z0-9]*$/,
   'Trait reference must be "TraitName" or "Alias.traits.TraitName"'
@@ -1504,6 +1530,15 @@ z.object({
   services: z.array(ServiceRefSchema).optional(),
   // Components (inline or reference)
   entity: EntityRefSchema,
+  // Mirrors the `OrbitalDefinition.auxiliaryEntities` type field — WAS
+  // undeclared here, so `OrbitalSchemaSchema.safeParse` (every load through
+  // `external-loader.ts`) silently stripped it on every externally-loaded
+  // orbital (zod drops unrecognized keys by default), while a schema parsed
+  // directly via `JSON.parse` kept it. Found via the entity-field auto-merge
+  // rebind-target fallback landing on the wrong entity for any RECURSIVELY
+  // loaded `uses` file (`packages/almadar-runtime/src/resolver/
+  // reference-resolver.ts`'s `mergeImportedEntityFieldsIntoOrbital`).
+  auxiliaryEntities: z.array(EntityRefSchema).optional(),
   traits: z.array(TraitRefSchema),
   pages: z.array(PageRefSchema),
   // Event interface (trait-centric model) - computed by resolver
@@ -1511,6 +1546,10 @@ z.object({
   listens: z.array(ComputedEventListenerSchema).optional(),
   // Filter for exposed events (trait-centric model)
   exposes: z.array(z.string()).optional(),
+  // This orbital's own declared knobs (§4.5)
+  config: DeclaredTraitConfigSchema.optional(),
+  // Transient — set by lowering, cleared by inline/resolve
+  reference: OrbitalRefObjectSchema.optional(),
   // Context fields - persisted throughout orbital lifecycle
   domainContext: DomainContextSchema.optional(),
   design: DesignPreferencesSchema.optional(),