@salsita-ai/sdk 0.50.0-develop.9440e83ee3 → 0.50.0-develop.95b896fd8c

package/dist/application-spec/generate-application/runtime/sections/preset-runtime.d.ts

@@ -1,7 +1,6 @@
 import { Branded } from '@salsita-ai/common/utils';
-import type { DomainEntity, ProductPreset } from '#package/domain';
+import type { DomainEntity, ProductPreset, SpecPreset } from '#package/domain';
 import type { RuntimeReferenceStore } from '../../../caching/index.js';
-import type { Preset } from '../../../parse-application-files/index.js';
 type AnyProductPreset = ProductPreset<DomainEntity<string>, DomainEntity<string>>;
 /** Collection of runtime presets with change tracking. */
 export type PresetRuntime = Branded<'PresetRuntime', {
@@ -10,7 +9,7 @@ export type PresetRuntime = Branded<'PresetRuntime', {
 }>;
 interface PresetRuntimeProps {
     readonly referenceScope: string;
-    readonly presets: readonly Preset[];
+    readonly presets: readonly SpecPreset[];
 }
 /**
  * Builds preset runtime objects with per-item reference stability.

package/dist/application-spec/generate-application/runtime/sections/reflection-constants-runtime.d.ts

@@ -1,4 +1,4 @@
-import type { ExpressionName, Expressions, MemoEvalPlan } from '../../../parse-application-files/index.js';
+import type { ExpressionName, Expressions, MemoEvalPlan } from '#package/domain';
 import type { SpecCodeMap } from '../spec-code/index.js';
 /** The self-free `constants:` plans declared on one entity or alias, or `undefined` when it has none. */
 export declare const findReflectionConstants: (expressions: Expressions, entityOrAlias: string) => ReadonlyMap<ExpressionName, MemoEvalPlan> | undefined;

package/dist/application-spec/generate-application/runtime/spec-code/resolve-spec-code.d.ts

@@ -1,4 +1,4 @@
-import type { SelfAccessor } from '../../../core/index.js';
+import type { SelfAccessor } from '#package/domain';
 import type { SpecCodeId } from '../../runtime-spec/index.js';
 import type { SpecCodeMap } from './spec-code-module.js';
 /**

package/dist/application-spec/generate-application/runtime/spec-runtime.d.ts

@@ -0,0 +1,21 @@
+import { Branded } from '@salsita-ai/common/utils';
+import type { RuntimeReferenceStore } from '../../caching/index.js';
+import type { RuntimeSpec } from '../runtime-spec/index.js';
+import { AdminSpecRuntime } from './admin-runtime/admin-spec-runtime.js';
+import { ConfiguratorSpecRuntime } from './configurator-runtime/configurator-spec-runtime.js';
+import type { SpecCodeModule } from './spec-code/index.js';
+/**
+ * The sections of both domains that the spec alone determines, without a project module: each
+ * domain's model and the data of its `phx.domain` factories.
+ *
+ * An application is built in two steps in one reference store. This is the first: it runs before
+ * the project's modules load, because they call the `phx.domain` factories while they are evaluated.
+ * The second, `ApplicationRuntime` with the loaded modules, builds the same sections through the
+ * same functions, so it returns the same objects: `phx.domain.model.X` is the reflection the
+ * application's domain validates with.
+ */
+export type SpecRuntime = Branded<'SpecRuntime', {
+    readonly configurator: ConfiguratorSpecRuntime;
+    readonly admin: AdminSpecRuntime;
+}>;
+export declare const SpecRuntime: (spec: RuntimeSpec, referenceStore: RuntimeReferenceStore, specCode: SpecCodeModule | undefined) => SpecRuntime;

package/dist/application-spec/generate-application/runtime/spec-runtime.js

@@ -0,0 +1 @@
+import{Branded as i}from"@salsita-ai/common/utils";import{AdminSpecRuntime as r}from"./admin-runtime/admin-spec-runtime.js";import{ConfiguratorSpecRuntime as o}from"./configurator-runtime/configurator-spec-runtime.js";export const SpecRuntime=(m,t,n)=>i({configurator:o(m,t,n?.configurator),admin:r(m,t,n?.admin)});

package/dist/application-spec/generate-application/runtime-spec/encoded-runtime-spec.d.ts

@@ -1,7 +1,8 @@
 /**
  * The version of the JSON format `encodeRuntimeSpec` writes. Raise it with every change to the
- * format or to the shape of `RuntimeSpec`, so that `decodeRuntimeSpec` refuses an artifact an older
- * or newer SDK wrote instead of building a runtime from data it does not understand.
+ * format or to the shape of `RuntimeSpec` once a released SDK has written the current version, so
+ * that `decodeRuntimeSpec` refuses an artifact an older or newer SDK wrote instead of building a
+ * runtime from data it does not understand.
  */
 export declare const RUNTIME_SPEC_FORMAT_VERSION = 1;
 /** One step from a value into a part of it: an object key or an array index. */

package/dist/application-spec/generate-application/runtime-spec/runtime-spec.d.ts

@@ -1,4 +1,4 @@
-import type { AdminSpec, ApplicationSpec, ConfiguratorSpec, EntitySchema, Infra, ModelVersion, ResolvedModelVersion, ResolvedVersions } from '../../parse-application-files/index.js';
+import type { AdminSpec, ApplicationSpec, AssistantSpec, ConfiguratorSpec, DataSchemaEntry, DataSchemas, DataSpec, EntitySchema, Infra, ModelVersion, ResolvedModelVersion, ResolvedVersions, Shape } from '../../parse-application-files/index.js';
 /**
  * The part of a parsed entity schema the runtime reads: the entity type and the schema of its
  * shape, from which it builds the entity's reflection. The full schema with `id` and `type` is
@@ -8,12 +8,22 @@ import type { AdminSpec, ApplicationSpec, ConfiguratorSpec, EntitySchema, Infra,
 export type RuntimeEntitySchema = Pick<EntitySchema, 'entityType' | 'shapeSchema'>;
 /**
  * The part of a parsed model version the runtime reads: the entity types, the aliases, the common
- * types and the schema of every entity's shape. The raw shapes and resolved shapes only serve the
- * parser and the type generator.
+ * types and the schema of every entity's shape. The shapes and the resolved shapes only serve the
+ * parser and the type generator, except the runtime schemas of the latest version's shapes (see
+ * `RuntimeLatestModelVersion`).
  */
 export type RuntimeModelVersion = Pick<ModelVersion, 'versionKey' | 'entityTypes' | 'rootEntityTypes' | 'aliases' | 'commonTypes'> & {
     readonly entitySchemas: readonly RuntimeEntitySchema[];
 };
+/**
+ * The latest model version of a domain as the runtime reads it: a model version plus the runtime
+ * schema of every shape, which `phx.domain.model` reflects as `<Name>Shape`.
+ */
+export type RuntimeLatestModelVersion = RuntimeModelVersion & {
+    readonly shapes: ReadonlyMap<Shape['name'], RuntimeShapeSchema>;
+};
+/** The part of a parsed shape the runtime reads: its name and its runtime JSON schema. */
+export type RuntimeShapeSchema = Pick<Shape, 'name' | 'runtimeSchema'>;
 /** One model version of a domain as the runtime reads it, with the migration file that leads to it. */
 export type RuntimeResolvedModelVersion = Omit<ResolvedModelVersion, 'modelVersion'> & {
     readonly modelVersion: RuntimeModelVersion;
@@ -24,15 +34,39 @@ export type RuntimeResolvedVersions = Pick<ResolvedVersions, 'latestVersion'> &
 };
 /** The model of a domain as the runtime reads it: the latest version and every earlier one. */
 interface RuntimeDomainModel {
-    readonly latestModel: RuntimeModelVersion;
+    readonly latestModel: RuntimeLatestModelVersion;
     readonly resolvedVersions: RuntimeResolvedVersions;
 }
+/** The part of a parsed data schema the runtime reads: the JSON schema it validates the data with. */
+export type RuntimeDataSchemaEntry = Pick<DataSchemaEntry, 'runtimeSchema'>;
+/**
+ * The data schemas as the runtime reads them: the JSON schema of each kind of data and the hash of
+ * the published data. The enhanced schemas, with Phoenix references, only serve the type generator.
+ */
+export type RuntimeDataSchemas = Pick<DataSchemas, 'publishedDataHash'> & {
+    readonly [KIND in Exclude<keyof DataSchemas, 'publishedDataHash' | 'backendData'>]: RuntimeDataSchemaEntry;
+} & {
+    readonly backendData: RuntimeDataSchemaEntry | undefined;
+};
+/**
+ * The assistant as the runtime reads it: its resolved manifest. The parsed assistant schema the
+ * manifest is resolved from only serves the parser.
+ */
+export type RuntimeAssistantSpec = Pick<NonNullable<AssistantSpec>, 'resolved'> | null;
+/**
+ * The data spec as the runtime reads it: the data entries and their chunks. The data entries and
+ * admin data pages the parser derives from them only serve the admin spec and the type generator.
+ */
+export type RuntimeDataSpec = Pick<DataSpec, 'entries' | 'chunks'>;
 /**
  * The configurator part of the runtime spec. It leaves out the configuration schema and its
  * version, which only a deployment registers, and the assistant's server settings (instructions
  * and AI settings), which must never reach the browser of a customer.
  */
-export type RuntimeConfiguratorSpec = Pick<ConfiguratorSpec, 'components' | 'presets' | 'expressions' | 'actions' | 'invariants' | 'dataSchemas' | 'defaults' | 'states' | 'theme' | 'ui' | 'transformers' | 'assistant'> & RuntimeDomainModel;
+export type RuntimeConfiguratorSpec = Pick<ConfiguratorSpec, 'components' | 'presets' | 'expressions' | 'actions' | 'invariants' | 'defaults' | 'states' | 'theme' | 'ui' | 'transformers'> & RuntimeDomainModel & {
+    readonly dataSchemas: RuntimeDataSchemas;
+    readonly assistant: RuntimeAssistantSpec;
+};
 /**
  * The admin part of the runtime spec. It leaves out the configuration schema and its version, which
  * only a deployment registers.
@@ -54,15 +88,16 @@ export type RuntimeInfra = Pick<Infra, 'acl' | 'resources' | 'resourcesConfig'>;
  * leaves out what only the parser, the type generator or a deployment use, and holds plain data,
  * Maps and Sets only, so it can be encoded as JSON.
  */
-export interface RuntimeSpec extends Pick<ApplicationSpec, 'appMetadata' | 'dataSpec'> {
+export interface RuntimeSpec extends Pick<ApplicationSpec, 'appMetadata'> {
+    readonly dataSpec: RuntimeDataSpec;
     readonly configurator: RuntimeConfiguratorSpec;
     readonly admin: RuntimeAdminSpec;
     readonly infra: RuntimeInfra;
 }
 /**
- * Takes from a parsed application spec the part the runtime reads. The sections it keeps are the
- * parsed values themselves, not copies; only the model versions are rebuilt without what the
- * runtime does not read.
+ * Takes from a parsed application spec the part the runtime reads. It reuses the sections it keeps
+ * whole, and builds trimmed copies of the model versions, data schemas, assistant and data spec
+ * without what the runtime does not read.
  */
 export declare const toRuntimeSpec: (spec: ApplicationSpec) => RuntimeSpec;
 export {};

package/dist/application-spec/generate-application/runtime-spec/runtime-spec.js

@@ -1 +1 @@
-let e=e=>({versionKey:e.versionKey,entityTypes:e.entityTypes,rootEntityTypes:e.rootEntityTypes,aliases:e.aliases,commonTypes:e.commonTypes,entitySchemas:e.entitySchemas.map(e=>({entityType:e.entityType,shapeSchema:e.shapeSchema}))}),s=s=>({latestModel:e(s.latestModel),resolvedVersions:{latestVersion:s.resolvedVersions.latestVersion,versionedModels:s.resolvedVersions.versionedModels.map(s=>({version:s.version,key:s.key,isLatest:s.isLatest,migrationFile:s.migrationFile,modelVersion:e(s.modelVersion)}))}});export const toRuntimeSpec=e=>{let{configurator:t,admin:a,infra:n}=e;return{configurator:{components:t.components,presets:t.presets,expressions:t.expressions,actions:t.actions,invariants:t.invariants,dataSchemas:t.dataSchemas,defaults:t.defaults,states:t.states,theme:t.theme,ui:t.ui,transformers:t.transformers,assistant:t.assistant,...s(t)},admin:{components:a.components,presets:a.presets,expressions:a.expressions,invariants:a.invariants,defaults:a.defaults,states:a.states,adminPages:a.adminPages,...s(a)},appMetadata:e.appMetadata,infra:{acl:n.acl,resources:n.resources,resourcesConfig:n.resourcesConfig},dataSpec:e.dataSpec}};
+let e=e=>({versionKey:e.versionKey,entityTypes:e.entityTypes,rootEntityTypes:e.rootEntityTypes,aliases:e.aliases,commonTypes:e.commonTypes,entitySchemas:e.entitySchemas.map(e=>({entityType:e.entityType,shapeSchema:e.shapeSchema}))}),s=e=>({runtimeSchema:e.runtimeSchema}),a=s=>{let a;return{latestModel:{...e(a=s.latestModel),shapes:new Map([...a.shapes].map(([e,s])=>[e,{name:s.name,runtimeSchema:s.runtimeSchema}]))},resolvedVersions:{latestVersion:s.resolvedVersions.latestVersion,versionedModels:s.resolvedVersions.versionedModels.map(s=>({version:s.version,key:s.key,isLatest:s.isLatest,migrationFile:s.migrationFile,modelVersion:e(s.modelVersion)}))}}};export const toRuntimeSpec=e=>{let t,{configurator:n,admin:i,infra:r}=e;return{configurator:{components:n.components,presets:n.presets,expressions:n.expressions,actions:n.actions,invariants:n.invariants,dataSchemas:{publishedDataHash:(t=n.dataSchemas).publishedDataHash,publishedData:s(t.publishedData),sessionData:s(t.sessionData),frontendData:s(t.frontendData),backendData:t.backendData&&s(t.backendData),finalizeData:s(t.finalizeData),prefetchedFinalizeData:s(t.prefetchedFinalizeData),finalizeResult:s(t.finalizeResult),callbackData:s(t.callbackData)},defaults:n.defaults,states:n.states,theme:n.theme,ui:n.ui,transformers:n.transformers,assistant:n.assistant&&{resolved:n.assistant.resolved},...a(n)},admin:{components:i.components,presets:i.presets,expressions:i.expressions,invariants:i.invariants,defaults:i.defaults,states:i.states,adminPages:i.adminPages,...a(i)},appMetadata:e.appMetadata,infra:{acl:r.acl,resources:r.resources,resourcesConfig:r.resourcesConfig},dataSpec:{entries:e.dataSpec.entries,chunks:e.dataSpec.chunks}}};

package/dist/application-spec/generate-application/runtime-spec/spec-code-id.d.ts

@@ -1,4 +1,4 @@
-import type { MemoEvalPlan } from '../../parse-application-files/index.js';
+import type { MemoEvalPlan } from '#package/domain';
 /**
  * The id under which the generated `.phoenix/spec-code.ts` holds one piece of code written in YAML,
  * and under which the runtime looks it up. Ids are unique within one domain; the configurator and

package/dist/application-spec/parse-application-files/parse-application-files.js

@@ -1 +1 @@
-import{Branded as e}from"@salsita-ai/common/utils";import{ParseContext as s}from"../core/index.js";import{CategorizedFiles as t}from"./categorize/index.js";import{MergedSpec as i}from"./merge/index.js";import{RawSpecFiles as r}from"./raw-spec/parse-raw-spec.js";import{RawMockTemplates as p}from"./raw-spec/raw-mock-templates.js";import{ResolvedSpecFiles as a}from"./resolve/index.js";import{ApplicationSpec as o}from"./spec/index.js";export const parseApplicationFiles=(l,n)=>{let{rawProjectFiles:m,phxDefinitions:c}=l,{evalExpressionParser:d,referenceStore:f,parsingContext:F}=n,u=F??new s,S=u.startSpan("parseApplicationFiles","build","parse-application-files.ts"),g=t(m,f,u,n);if(!g)return S(),u.toResult(void 0);let w=u.startSpan("RawSpecFiles","parseApplicationFiles","parse-raw-spec.ts"),A=r(g.spec,u);w();let R=u.startSpan("RawMockTemplates","parseApplicationFiles","raw-mock-templates.ts"),j=p(g.mockTemplates,u);if(R(),!A)return S(),u.toResult(void 0);let v=u.startSpan("ResolvedSpecFiles","parseApplicationFiles","resolved-spec-files.ts"),x=a(A,m,u);v();let k=u.startSpan("MergedSpec","parseApplicationFiles","merged-spec.ts"),M=i(x,u);if(k(),u.hasErrors)return S(),u.toResult(void 0);let T=u.startSpan("ApplicationSpec","parseApplicationFiles","application-spec.ts"),b=o({merged:M,migrationFiles:g.migrations,adminMigrationFiles:g.adminMigrations,transformerFiles:g.transformers.map(e=>e.file.name),phxDefinitions:c,evalExpressionParser:d},u);return(T(),b)?(S(),u.toResult(e({rawProjectFiles:m,categorizedFiles:g,rawMockTemplates:j,applicationSpec:b}))):(S(),u.toResult(void 0))};
+import{Branded as e}from"@salsita-ai/common/utils";import{ParseContext as s}from"../core/index.js";import{DiagnosticCode as t,diagnosticMessages as r}from"../errors/index.js";import{CategorizedFiles as i}from"./categorize/index.js";import{MergedSpec as a}from"./merge/index.js";import{RawSpecFiles as p}from"./raw-spec/parse-raw-spec.js";import{RawMockTemplates as o}from"./raw-spec/raw-mock-templates.js";import{ResolvedSpecFiles as l}from"./resolve/index.js";import{ApplicationSpec as n}from"./spec/index.js";export const parseApplicationFiles=(m,c)=>{let{rawProjectFiles:d,phxDefinitions:f}=m,{evalExpressionParser:u,referenceStore:F,parsingContext:A}=c,g=A??new s,w=g.startSpan("parseApplicationFiles","build","parse-application-files.ts"),R=i(d,F,g,c);if(!R)return w(),g.toResult(void 0);let S=g.startSpan("RawSpecFiles","parseApplicationFiles","parse-raw-spec.ts"),T=p(R.spec,g);S();let j=g.startSpan("RawMockTemplates","parseApplicationFiles","raw-mock-templates.ts"),O=o(R.mockTemplates,g);if(j(),!T)return w(),g.toResult(void 0);let k=g.startSpan("ResolvedSpecFiles","parseApplicationFiles","resolved-spec-files.ts"),v=l(T,d,g);k();let x=g.startSpan("MergedSpec","parseApplicationFiles","merged-spec.ts"),H=a(v,g);if(x(),g.hasErrors)return w(),g.toResult(void 0);let E=g.startSpan("ApplicationSpec","parseApplicationFiles","application-spec.ts"),M=n({merged:H,migrationFiles:R.migrations,adminMigrationFiles:R.adminMigrations,transformerFiles:R.transformers.map(e=>e.file.name),phxDefinitions:f,evalExpressionParser:u},g);return(E(),M)?(!R.hasWebhookEntry&&(M.appMetadata.useAuthHook||M.appMetadata.useClerk)&&g.warning(t.AUTH_WITHOUT_PROJECT_WEBHOOK,r.AUTH_WITHOUT_PROJECT_WEBHOOK()),w(),g.toResult(e({rawProjectFiles:d,categorizedFiles:R,rawMockTemplates:O,applicationSpec:M}))):(w(),g.toResult(void 0))};

package/dist/application-spec/parse-application-files/raw-spec/raw-expressions.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
+import { type EnhancedJsonValue } from '#package/domain';
 import { type EnhancedJsonSchemaType } from '../../core/enhanced-json-schema.js';
-import { type EnhancedJsonValue } from '../../core/enhanced-json-value.js';
 /**
  * Discriminator tag for a single parsed expression entry.
  *

package/dist/application-spec/parse-application-files/raw-spec/raw-expressions.js

@@ -1 +1 @@
-import{z as r}from"zod";import{enhancedJsonSchema as e,extendEnhancedJsonSchema as s}from"../../core/enhanced-json-schema.js";import{EVAL_MARKER_KEY as n,evalMarkerSchema as o}from"../../core/markers/eval-marker.js";import{MSG_ID_MARKER_KEY as a,MSG_MARKER_KEY as t,msgMarkerSchema as i}from"../../core/markers/msg-marker.js";export const RawExpressionKind={User:"user",Value:"value"};let m=s(o),c=s(i),d=[n,t,a],l=r=>{let e={};for(let[s,n]of Object.entries(r))d.includes(s)||(e[s]=n);return e};export const rawExpressionEntrySchema=r.union([m,c,e]).transform(r=>{if(n in r)return{kind:RawExpressionKind.Value,constant:!1,value:{[n]:r.$eval},schema:l(r)};if(t in r){let e=void 0!==r.$msgId?{[t]:r.$msg,[a]:r.$msgId}:{[t]:r.$msg};return{kind:RawExpressionKind.Value,constant:!1,value:e,schema:l(r)}}return{kind:RawExpressionKind.User,schema:r}});export const rawExpressionsSchema=r.record(r.string(),r.record(r.string(),rawExpressionEntrySchema).readonly()).readonly();
+import{z as e}from"zod";import{EVAL_MARKER_KEY as r,MSG_ID_MARKER_KEY as n,MSG_MARKER_KEY as s,evalMarkerSchema as o,msgMarkerSchema as a}from"#package/domain";import{enhancedJsonSchema as i,extendEnhancedJsonSchema as t}from"../../core/enhanced-json-schema.js";export const RawExpressionKind={User:"user",Value:"value"};let c=t(o),m=t(a),d=[r,s,n],p=e=>{let r={};for(let[n,s]of Object.entries(e))d.includes(n)||(r[n]=s);return r};export const rawExpressionEntrySchema=e.union([c,m,i]).transform(e=>{if(r in e)return{kind:RawExpressionKind.Value,constant:!1,value:{[r]:e.$eval},schema:p(e)};if(s in e){let r=void 0!==e.$msgId?{[s]:e.$msg,[n]:e.$msgId}:{[s]:e.$msg};return{kind:RawExpressionKind.Value,constant:!1,value:r,schema:p(e)}}return{kind:RawExpressionKind.User,schema:e}});export const rawExpressionsSchema=e.record(e.string(),e.record(e.string(),rawExpressionEntrySchema).readonly()).readonly();

package/dist/application-spec/parse-application-files/spec/components/bindings/read-binding.d.ts

@@ -1,18 +1,8 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { ComponentReadBinding as ComponentReadBindingData } from '#package/domain';
 import type { ParseContext } from '../../../../core/index.js';
 import type { EntityOrAliasName, InstanceName, ResolvedShape } from '../../model/index.js';
-/**
- * A validated `$read` dependency found anywhere in the component props tree.
- * Used for memoEval dependency tracking — the target becomes `self.target` in generated code.
- * Field targets are validated against the entity shape; expression targets ($-prefixed)
- * are accepted without validation (they may be inferred during Phase C).
- */
-export type ComponentReadBinding = Branded<'ComponentReadBinding', {
-    /** The raw target string from `$read` (e.g. "height" or "$price"). */
-    readonly target: string;
-    /** Whether the target is an expression (starts with `$`) or a shape field. */
-    readonly isExpression: boolean;
-}>;
+/** A validated `$read` dependency of a component; see {@link ComponentReadBindingData | ComponentReadBinding} in `domain`. */
+export type ComponentReadBinding = ComponentReadBindingData;
 export interface ComponentReadBindingContext {
     readonly entityKey: EntityOrAliasName;
     readonly componentName: string;

package/dist/application-spec/parse-application-files/spec/components/bindings/write-binding.d.ts

@@ -1,42 +1,14 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { AssertionKind, ComponentWriteBinding as ComponentWriteBindingData } from '#package/domain';
 import { type EnhancedJsonSchemaType, type ParseContext } from '../../../../core/index.js';
 import { type EntityOrAliasName, type InstanceName, type ResolvedShape } from '../../model/index.js';
-/**
- * Runtime type assertion to emit in the write callback.
- * Resolved from the target entity field's schema during parsing.
- */
-export type AssertionKind = {
-    readonly kind: 'declaredType';
-    readonly typeName: string;
-} | {
-    readonly kind: 'declaredTypeId';
-    readonly referencedType: string;
-} | {
-    readonly kind: 'primitive';
-    readonly assertFn: 'assertString' | 'assertNumber' | 'assertBoolean';
-} | {
-    readonly kind: 'literal';
-    readonly value: null;
-} | {
-    readonly kind: 'anyOf';
-    readonly assertions: readonly AssertionKind[];
-} | {
-    readonly kind: 'none';
-};
+export type { AssertionKind } from '#package/domain';
 /**
  * Resolves the assertion kind from a field's schema.
  * Ported from domain-spec/spec/resolve-assertions.ts.
  */
 export declare const resolveAssertionKind: (fieldSchema: EnhancedJsonSchemaType) => AssertionKind;
-/**
- * A validated `$write` or `$bind` mapping from a component state key to an entity field.
- * Includes the resolved assertion kind for runtime type checking in the write callback.
- */
-export type ComponentWriteBinding = Branded<'ComponentWriteBinding', {
-    readonly propKey: string;
-    readonly entityField: string;
-    readonly assertion: AssertionKind;
-}>;
+/** A validated `$write` or `$bind` mapping of a component; see {@link ComponentWriteBindingData | ComponentWriteBinding} in `domain`. */
+export type ComponentWriteBinding = ComponentWriteBindingData;
 export interface ComponentWriteBindingContext {
     readonly entityKey: EntityOrAliasName;
     readonly componentName: string;

package/dist/application-spec/parse-application-files/spec/components/component-filter.d.ts

@@ -1,5 +1,5 @@
-import { Branded } from '@salsita-ai/common/utils';
-import { type ComponentFilter, type EnhancedJsonSchemaType, type EnhancedJsonValue } from '../../../core/index.js';
+import type { ComponentFilters as ComponentFiltersData } from '#package/domain';
+import { type EnhancedJsonSchemaType, type EnhancedJsonValue } from '../../../core/index.js';
 /**
  * Schema types for each filter criterion, used for expression inference.
  * When `$read: '$expr'` appears in a filter criterion, the expression is
@@ -7,14 +7,8 @@ import { type ComponentFilter, type EnhancedJsonSchemaType, type EnhancedJsonVal
  * infers `$x` as `boolean`).
  */
 export declare const FILTER_CRITERION_SCHEMAS: Readonly<Record<string, EnhancedJsonSchemaType>>;
-/**
- * Validated set of `$filter` entries on a user-bound component instance. Each
- * `ComponentFilter` represents one alternative filter condition; multiple
- * entries arise from `$or`. Empty `items` means no filter is applied.
- */
-export type ComponentFilters = Branded<'ComponentFilters', {
-    readonly items: readonly ComponentFilter[];
-}>;
+/** The validated `$filter` entries of a component instance; see {@link ComponentFiltersData | ComponentFilters} in `domain`. */
+export type ComponentFilters = ComponentFiltersData;
 /**
  * Parses a raw `$filter` value into a {@link ComponentFilters}. The shape is
  * guaranteed by upstream AJV validation against `ComponentSystemFilter` — this

package/dist/application-spec/parse-application-files/spec/components/components.d.ts

@@ -1,10 +1,9 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { ComponentEntry, Components as ComponentsData } from '#package/domain';
 import type { ParseContext } from '../../../core/index.js';
 import type { Aliases } from '../model/index.js';
-import type { ComponentEntry } from './component-entry.js';
 import type { UserComponents } from './user-components.js';
-/** Final merged components for a domain, including SDK/spec-derived entries. */
-export type Components = Branded<'Components', readonly ComponentEntry[]>;
+/** The merged components of a domain; see {@link ComponentsData | Components} in `domain`. */
+export type Components = ComponentsData;
 interface ComponentsProps {
     readonly userComponents: UserComponents;
     readonly generatedComponents: readonly ComponentEntry[];

package/dist/application-spec/parse-application-files/spec/components/index.d.ts

@@ -1,7 +1,6 @@
+export { type ComponentEntry, type ComponentImplementation, type ComponentPropTarget, type CompositeImplementation, type RootReadImplementation, type SdkFactory, type SdkFactoryParam, isComponentPropTarget, } from '#package/domain';
 export * from './bindings/index.js';
-export type * from './component-entry.js';
 export * from './component-filter.js';
-export * from './component-prop-target.js';
 export * from './components.js';
 export * from './sdk-component-entry.js';
 export * from './user-component-entry.js';

package/dist/application-spec/parse-application-files/spec/components/index.js

@@ -1 +1 @@
-export*from"./bindings/index.js";export*from"./component-filter.js";export*from"./component-prop-target.js";export*from"./components.js";export*from"./sdk-component-entry.js";export*from"./user-component-entry.js";export*from"./user-components.js";
+export{isComponentPropTarget}from"#package/domain";export*from"./bindings/index.js";export*from"./component-filter.js";export*from"./components.js";export*from"./sdk-component-entry.js";export*from"./user-component-entry.js";export*from"./user-components.js";

package/dist/application-spec/parse-application-files/spec/components/sdk-component-entry.d.ts

@@ -1,5 +1,5 @@
+import type { ComponentEntry, SdkFactory } from '#package/domain';
 import type { Aliases, EntityOrAliasName, InstanceName } from '../model/index.js';
-import type { ComponentEntry, SdkFactory } from './component-entry.js';
 import type { ComponentFilters } from './component-filter.js';
 interface SdkComponentImplementation {
     readonly kind: 'sdk';

package/dist/application-spec/parse-application-files/spec/components/user-component-entry.d.ts

@@ -1,9 +1,8 @@
+import type { ComponentEntry, SpecExpression } from '#package/domain';
 import { type EnhancedJsonObject, type ParseContext } from '../../../core/index.js';
 import { type ValueTypeResolution } from '../common/index.js';
 import type { ExpressionRead } from '../expressions/expression-read.js';
-import type { Expression } from '../expressions/expression.js';
 import type { EntityOrAliasName, InstanceName, ResolvedShape } from '../model/index.js';
-import type { ComponentEntry } from './component-entry.js';
 interface UserComponentProps {
     readonly typeOrAlias: EntityOrAliasName;
     readonly instanceName: InstanceName;
@@ -18,7 +17,7 @@ interface UserComponentContext {
 }
 export interface UserComponentResult {
     readonly entry: ComponentEntry;
-    readonly inferredExpressions: readonly Expression[];
+    readonly inferredExpressions: readonly SpecExpression[];
     /** Every `$read` of an expression in the instance, with the type expected where it is read. */
     readonly expressionReads: readonly ExpressionRead[];
 }

package/dist/application-spec/parse-application-files/spec/components/user-component-entry.js

@@ -1 +1 @@
-import{Branded as e}from"@salsita-ai/common/utils";import{componentsByName as t}from"#package/domain";import{FILTER_CRITERION_KEYS as n,FILTER_KEY as r,FILTER_OR_KEY as i,READ_MARKER_KEY as o,isEnhancedJsonObject as a,isEvalMarker as m,isImportRefShaped as p,isRawBindMarker as s,isRawDataRefMarker as l,isRawEvalWriteMarker as d,isRawReadMarker as c,isRawReadWriteMarker as f,navigateSchema as y}from"../../../core/index.js";import{DiagnosticCode as u,diagnosticMessages as g}from"../../../errors/index.js";import{ValueType as N,valueTypeAt as $}from"../common/index.js";import{MemoEvalPlan as O}from"../expressions/memo-eval-plan.js";import{ComponentReadBinding as S,ComponentWriteBinding as A,checkReadBindingType as k,componentPath as R,formatComponentPropPath as T,isExpressionReadTarget as b}from"./bindings/index.js";import{ComponentFilters as h,FILTER_CRITERION_SCHEMAS as P}from"./component-filter.js";import{componentStateType as E}from"./component-state-type.js";import{FILTER_CRITERION_TYPE_SCHEMAS as j,ROOT_FILTER_TYPE_SCHEMA as v}from"./filter-criterion-types.js";import{checkStaticEntityId as _}from"./static-entity-id.js";let x=(e,t,n,r)=>{if(null==e||"object"!=typeof e)return void 0!==e&&n.checkStaticValue(e,t),e;if(c(e))return n.addReadBinding(e.$read,t,"$read"),{$target:e.$read};if(l(e))return void r.parsingContext.at(String(r.entityKey),r.componentName,String(r.instanceName),...t.map(String)).error(u.COMPONENT_DATA_REF_UNSUPPORTED,g.COMPONENT_DATA_REF_UNSUPPORTED(String(r.entityKey),r.componentName,String(r.instanceName),T(t),e.$read,e.$data));if(s(e))return n.addReadBinding(e.$bind,t,"$bind"),{$target:e.$bind};if(m(e))return e;if(p(e))return void r.parsingContext.at(String(r.entityKey),r.componentName,String(r.instanceName),...t.map(String)).error(u.COMPONENT_IMPORT_REF_UNSUPPORTED,g.COMPONENT_IMPORT_REF_UNSUPPORTED(String(r.entityKey),r.componentName,String(r.instanceName),T(t),e.$importRef.module,e.$importRef.member));if(Array.isArray(e))return e.map((e,i)=>x(e,[...t,i],n,r)).filter(e=>void 0!==e);let i={};for(let[o,a]of Object.entries(e)){let e=x(a,[...t,o],n,r);void 0!==e&&(i[o]=e)}return i},C=(t,n,r)=>{for(let i of t.items)if("gradual"===i.kind){for(let[t,o]of Object.entries(i))if("kind"!==t&&o?.kind==="dynamic"&&o.target&&b(o.target)){let i=P[t];i&&r.push(e({entityKey:n,name:o.target,schema:i,implementation:{kind:"user"}}))}}},U=(e,t,n,r)=>{if("string"==typeof e||"number"==typeof e||"boolean"==typeof e||null===e)return void _(e,t,n,r);if("object"==typeof e)for(let[i,o]of Object.entries(e)){let a=Array.isArray(e)?Number(i):i;U(o,[...t,a],$(n,[a]),r)}};export const UserComponentEntry=(m,p)=>{let{implementation:l,inferredExpressions:c,expressionReads:T}=((m,p)=>{let l,c=t.get(m.componentName),T=c?.schema,P=new Set,w=[],D=[],I=[],K={entityKey:m.typeOrAlias,componentName:m.componentName,instanceName:m.instanceName,resolvedShape:p.resolvedShape,parsingContext:p.parsingContext},B={entityKey:m.typeOrAlias,componentName:m.componentName,instanceName:m.instanceName,resolvedShape:p.resolvedShape,parsingContext:p.parsingContext},F={...K,typeResolution:p.typeResolution},M=e=>T?$(l??=E(T,p.typeResolution),e):[{kind:"unknown"}],G=[],V=e=>{b(e.target)?G.push({entityKey:m.typeOrAlias,name:e.target,expected:e.expected,location:R(K,e.path)}):k(e,F)},L=(t,n,r)=>{if(V({marker:r,target:t,path:n,expected:M(n)}),!P.has(t)&&(P.add(t),w.push(S(t,K)),b(t)&&T)){let r=((t,n,r,i)=>{let{schema:o,lastDeclaredType:a,pathSinceDeclaredType:m}=y(r,n),p=n=>e({entityKey:i,name:t,schema:n,implementation:{kind:"user"}});if(void 0!==a){let e=m.map(e=>"number"==typeof e?"[number]":`['${e}']`).join("");return p({...o,tsType:`${a.tsType}${e}`,import:a.import})}if(Object.keys(o).length>0)return p(o)})(t,n,T,m.typeOrAlias);r&&I.push(r)}},W={addReadBinding:L,checkStaticValue:(e,t)=>_(e,t,M(t),K)},q=h(m.rawProps[r]);((e,t,o,m)=>{let p=e=>N(e,{...o.typeResolution,author:"sdk"}),s=void 0!==e&&a(e)&&Array.isArray(e[i]);for(let[e,a]of t.items.entries()){let t=s?[r,i,e]:[r];if("root"===a.kind){m({marker:"$read",target:a.target,path:t,expected:p(v)});continue}for(let e of n){let n=a[e],r=[...t,e],i=p(j[e]);n?.kind==="dynamic"?m({marker:"$read",target:n.target,path:r,expected:i}):n?.kind==="static"&&U(n.value,r,i,o)}}})(m.rawProps[r],q,F,V);let z=`${String(m.typeOrAlias)}.${String(m.instanceName)}`;if((e=>{if(!(o in e)||"string"!=typeof e[o])return!1;for(let t of Object.keys(e))if(t!==o&&t!==r)return!1;return!0})(m.rawProps)){let e=m.rawProps[o];return L(e,[],"$read"),C(q,m.typeOrAlias,I),{implementation:{kind:"userBound",filters:q,plan:O({$target:e},z),implementation:{kind:"rootRead",readBinding:w[0]}},inferredExpressions:I,expressionReads:G}}let H={};for(let[e,t]of Object.entries(m.rawProps)){if(e===r)continue;if(s(t)){D.push(A(e,t.$bind,B)),L(t.$bind,[e],"$bind"),H[e]={$target:t.$bind};continue}if(f(t)){L(t.$read,[e],"$read"),D.push(A(e,t.$write,B)),H[e]={$target:t.$read};continue}if(d(t)){D.push(A(e,t.$write,B)),H[e]={$eval:t.$eval};continue}let n=x(t,[e],W,K);void 0!==n&&(H[e]=n)}let J=new Map;for(let e of D){let t=J.get(e.entityField);t?p.parsingContext.error(u.WRITE_BINDING_DUPLICATE_TARGET,g.WRITE_BINDING_DUPLICATE_TARGET(String(m.typeOrAlias),m.componentName,String(m.instanceName),e.entityField,t,e.propKey)):J.set(e.entityField,e.propKey)}return C(q,m.typeOrAlias,I),{implementation:{kind:"userBound",filters:q,plan:O(H,z),implementation:{kind:"composite",resolvedProps:H,readBindings:w,writeBindings:D}},inferredExpressions:I,expressionReads:G}})(m,p);return{entry:e({typeOrAlias:m.typeOrAlias,instanceName:m.instanceName,isAlias:"alias"===p.resolvedShape.kind,componentName:m.componentName,implementation:l}),inferredExpressions:c,expressionReads:T}};
+import{Branded as e}from"@salsita-ai/common/utils";import{componentsByName as t}from"#package/domain";import{FILTER_CRITERION_KEYS as n,FILTER_KEY as r,FILTER_OR_KEY as i,READ_MARKER_KEY as o,isEnhancedJsonObject as a,isEvalMarker as p,isImportRefShaped as m,isRawBindMarker as s,isRawDataRefMarker as d,isRawEvalWriteMarker as l,isRawReadMarker as c,isRawReadWriteMarker as f,navigateSchema as y}from"../../../core/index.js";import{DiagnosticCode as u,diagnosticMessages as g}from"../../../errors/index.js";import{ValueType as N,valueTypeAt as $}from"../common/index.js";import{MemoEvalPlan as O}from"../expressions/index.js";import{ComponentReadBinding as S,ComponentWriteBinding as A,checkReadBindingType as k,componentPath as R,formatComponentPropPath as T,isExpressionReadTarget as b}from"./bindings/index.js";import{ComponentFilters as h,FILTER_CRITERION_SCHEMAS as P}from"./component-filter.js";import{componentStateType as E}from"./component-state-type.js";import{FILTER_CRITERION_TYPE_SCHEMAS as j,ROOT_FILTER_TYPE_SCHEMA as x}from"./filter-criterion-types.js";import{checkStaticEntityId as _}from"./static-entity-id.js";let v=(e,t,n,r)=>{if(null==e||"object"!=typeof e)return void 0!==e&&n.checkStaticValue(e,t),e;if(c(e))return n.addReadBinding(e.$read,t,"$read"),{$target:e.$read};if(d(e))return void r.parsingContext.at(String(r.entityKey),r.componentName,String(r.instanceName),...t.map(String)).error(u.COMPONENT_DATA_REF_UNSUPPORTED,g.COMPONENT_DATA_REF_UNSUPPORTED(String(r.entityKey),r.componentName,String(r.instanceName),T(t),e.$read,e.$data));if(s(e))return n.addReadBinding(e.$bind,t,"$bind"),{$target:e.$bind};if(p(e))return e;if(m(e))return void r.parsingContext.at(String(r.entityKey),r.componentName,String(r.instanceName),...t.map(String)).error(u.COMPONENT_IMPORT_REF_UNSUPPORTED,g.COMPONENT_IMPORT_REF_UNSUPPORTED(String(r.entityKey),r.componentName,String(r.instanceName),T(t),e.$importRef.module,e.$importRef.member));if(Array.isArray(e))return e.map((e,i)=>v(e,[...t,i],n,r)).filter(e=>void 0!==e);let i={};for(let[o,a]of Object.entries(e)){let e=v(a,[...t,o],n,r);void 0!==e&&(i[o]=e)}return i},C=(t,n,r)=>{for(let i of t.items)if("gradual"===i.kind){for(let[t,o]of Object.entries(i))if("kind"!==t&&o?.kind==="dynamic"&&o.target&&b(o.target)){let i=P[t];i&&r.push(e({entityKey:n,name:o.target,schema:i,implementation:{kind:"user"}}))}}},U=(e,t,n,r)=>{if("string"==typeof e||"number"==typeof e||"boolean"==typeof e||null===e)return void _(e,t,n,r);if("object"==typeof e)for(let[i,o]of Object.entries(e)){let a=Array.isArray(e)?Number(i):i;U(o,[...t,a],$(n,[a]),r)}};export const UserComponentEntry=(p,m)=>{let{implementation:d,inferredExpressions:c,expressionReads:T}=((p,m)=>{let d,c=t.get(p.componentName),T=c?.schema,P=new Set,w=[],D=[],I=[],K={entityKey:p.typeOrAlias,componentName:p.componentName,instanceName:p.instanceName,resolvedShape:m.resolvedShape,parsingContext:m.parsingContext},B={entityKey:p.typeOrAlias,componentName:p.componentName,instanceName:p.instanceName,resolvedShape:m.resolvedShape,parsingContext:m.parsingContext},F={...K,typeResolution:m.typeResolution},M=e=>T?$(d??=E(T,m.typeResolution),e):[{kind:"unknown"}],G=[],V=e=>{b(e.target)?G.push({entityKey:p.typeOrAlias,name:e.target,expected:e.expected,location:R(K,e.path)}):k(e,F)},L=(t,n,r)=>{if(V({marker:r,target:t,path:n,expected:M(n)}),!P.has(t)&&(P.add(t),w.push(S(t,K)),b(t)&&T)){let r=((t,n,r,i)=>{let{schema:o,lastDeclaredType:a,pathSinceDeclaredType:p}=y(r,n),m=n=>e({entityKey:i,name:t,schema:n,implementation:{kind:"user"}});if(void 0!==a){let e=p.map(e=>"number"==typeof e?"[number]":`['${e}']`).join("");return m({...o,tsType:`${a.tsType}${e}`,import:a.import})}if(Object.keys(o).length>0)return m(o)})(t,n,T,p.typeOrAlias);r&&I.push(r)}},W={addReadBinding:L,checkStaticValue:(e,t)=>_(e,t,M(t),K)},q=h(p.rawProps[r]);((e,t,o,p)=>{let m=e=>N(e,{...o.typeResolution,author:"sdk"}),s=void 0!==e&&a(e)&&Array.isArray(e[i]);for(let[e,a]of t.items.entries()){let t=s?[r,i,e]:[r];if("root"===a.kind){p({marker:"$read",target:a.target,path:t,expected:m(x)});continue}for(let e of n){let n=a[e],r=[...t,e],i=m(j[e]);n?.kind==="dynamic"?p({marker:"$read",target:n.target,path:r,expected:i}):n?.kind==="static"&&U(n.value,r,i,o)}}})(p.rawProps[r],q,F,V);let z=`${String(p.typeOrAlias)}.${String(p.instanceName)}`;if((e=>{if(!(o in e)||"string"!=typeof e[o])return!1;for(let t of Object.keys(e))if(t!==o&&t!==r)return!1;return!0})(p.rawProps)){let e=p.rawProps[o];return L(e,[],"$read"),C(q,p.typeOrAlias,I),{implementation:{kind:"userBound",filters:q,plan:O({$target:e},z),implementation:{kind:"rootRead",readBinding:w[0]}},inferredExpressions:I,expressionReads:G}}let H={};for(let[e,t]of Object.entries(p.rawProps)){if(e===r)continue;if(s(t)){D.push(A(e,t.$bind,B)),L(t.$bind,[e],"$bind"),H[e]={$target:t.$bind};continue}if(f(t)){L(t.$read,[e],"$read"),D.push(A(e,t.$write,B)),H[e]={$target:t.$read};continue}if(l(t)){D.push(A(e,t.$write,B)),H[e]={$eval:t.$eval};continue}let n=v(t,[e],W,K);void 0!==n&&(H[e]=n)}let J=new Map;for(let e of D){let t=J.get(e.entityField);t?m.parsingContext.error(u.WRITE_BINDING_DUPLICATE_TARGET,g.WRITE_BINDING_DUPLICATE_TARGET(String(p.typeOrAlias),p.componentName,String(p.instanceName),e.entityField,t,e.propKey)):J.set(e.entityField,e.propKey)}return C(q,p.typeOrAlias,I),{implementation:{kind:"userBound",filters:q,plan:O(H,z),implementation:{kind:"composite",resolvedProps:H,readBindings:w,writeBindings:D}},inferredExpressions:I,expressionReads:G}})(p,m);return{entry:e({typeOrAlias:p.typeOrAlias,instanceName:p.instanceName,isAlias:"alias"===m.resolvedShape.kind,componentName:p.componentName,implementation:d}),inferredExpressions:c,expressionReads:T}};

package/dist/application-spec/parse-application-files/spec/components/user-components.d.ts

@@ -1,10 +1,9 @@
 import { Branded } from '@salsita-ai/common/utils';
+import type { ComponentEntry, SpecExpression } from '#package/domain';
 import type { ParseContext, PhoenixDefinitions } from '../../../core/index.js';
 import type { MergedComponents } from '../../merge/index.js';
 import type { ExpressionRead } from '../expressions/expression-read.js';
-import type { Expression } from '../expressions/expression.js';
 import type { ModelVersion } from '../model/index.js';
-import type { ComponentEntry } from './component-entry.js';
 /** User-declared component entries, flattened from the nested merge map. */
 export type UserComponents = Branded<'UserComponents', readonly ComponentEntry[]>;
 interface UserComponentsContext {
@@ -14,7 +13,7 @@ interface UserComponentsContext {
 }
 interface UserComponentsResult {
     readonly components: UserComponents;
-    readonly expressions: readonly Expression[];
+    readonly expressions: readonly SpecExpression[];
     /** Every `$read` of an expression in a component, with the type expected where it is read. */
     readonly expressionReads: readonly ExpressionRead[];
 }

package/dist/application-spec/parse-application-files/spec/expressions/expression-read-types.d.ts

@@ -1,14 +1,14 @@
+import type { SpecExpression } from '#package/domain';
 import type { ParseContext } from '../../../core/index.js';
 import type { EntityOrAliasName, ExpressionName, ModelTypeResolution } from '../model/index.js';
 import type { ExpressionRead } from './expression-read.js';
-import type { Expression } from './expression.js';
 /** Where an expression is declared: the spec section and the entity or alias under it. */
 export interface ExpressionLocation {
     readonly section: string;
     readonly entityKey: EntityOrAliasName;
 }
 interface ExpressionReadTypesInput {
-    readonly userExpressions: readonly Expression[];
+    readonly userExpressions: readonly SpecExpression[];
     readonly expressionReads: readonly ExpressionRead[];
     /** Finds where a read expression is declared, which is where a conflict is reported. */
     readonly locateDeclaration: (entityKey: EntityOrAliasName, name: ExpressionName) => ExpressionLocation;

package/dist/application-spec/parse-application-files/spec/expressions/expressions.d.ts

@@ -1,37 +1,15 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { Expressions as ExpressionsData, SpecExpression } from '#package/domain';
 import { type EvalExpressionParser, type ParseContext, type PhoenixDefinitions } from '../../../core/index.js';
 import type { MergedExpressions } from '../../merge/index.js';
-import { type Aliases, type EntityOrAliasName, type EntityTypeName, type ExpressionName, type ModelVersion } from '../model/index.js';
+import { type Aliases, type EntityTypeName, type ModelVersion } from '../model/index.js';
 import type { ExpressionRead } from './expression-read.js';
-import type { Expression } from './expression.js';
-import type { MemoEvalPlan } from './memo-eval-plan.js';
-export type { Expression, ExpressionImplementation } from './expression.js';
-/**
- * Resolved expressions for a single entity type. Holds the ordered list of
- * shape source keys (entity itself + aliases it belongs to) — codegen appends
- * `"Expressions"` to each key to reference the typed expression group.
- */
-export type EntityExpressions = Branded<'EntityExpressions', {
-    /** Entity/alias keys whose expressions this entity inherits. Codegen appends "Expressions" suffix. */
-    readonly shapeGroups: readonly EntityOrAliasName[];
-}>;
-/**
- * Final merged expressions for a domain — user-declared + inferred.
- * The internal `expressions` map groups by entity/alias for codegen/runtime lookups.
- * `entityExpressions` provides per-entity alias expansion.
- * `constants` projects the self-free `constants:` values, grouped like `expressions`;
- * codegen passes them to the enhanced entity/alias reflections so they are readable at
- * module level (`phx.domain.enhancedModel.$Wall.$maxWidth`). A constant whose plan uses
- * `self` needs an instance, so it stays an ordinary value expression and is absent here.
- */
-export type Expressions = Branded<'Expressions', {
-    readonly expressions: ReadonlyMap<EntityOrAliasName, ReadonlyMap<ExpressionName, Expression>>;
-    readonly entityExpressions: ReadonlyMap<EntityTypeName, EntityExpressions>;
-    readonly constants: ReadonlyMap<EntityOrAliasName, ReadonlyMap<ExpressionName, MemoEvalPlan>>;
-}>;
+export type { EntityExpressions } from '#package/domain';
+export type { ExpressionImplementation, SpecExpression as Expression } from '#package/domain';
+/** The merged expressions of a domain; see {@link ExpressionsData | Expressions} in `domain`. */
+export type Expressions = ExpressionsData;
 interface ExpressionsProps {
     readonly rawExpressions: MergedExpressions;
-    readonly inferredExpressions: readonly Expression[];
+    readonly inferredExpressions: readonly SpecExpression[];
     /** The `$read`s of expressions in components, whose expected types the expressions must share. */
     readonly expressionReads: readonly ExpressionRead[];
 }

package/dist/application-spec/parse-application-files/spec/expressions/index.d.ts

@@ -1,4 +1,3 @@
-export type * from './expression.js';
 export * from './expressions.js';
 export * from './memo-eval-plan.js';
 export * from './user-expressions.js';

package/dist/application-spec/parse-application-files/spec/expressions/memo-eval-plan.d.ts

@@ -1,74 +1,7 @@
-import { Branded } from '@salsita-ai/common/utils';
-import { type EvalMarker, type MsgMarker } from '../../../core/index.js';
-import { type ComponentPropTarget } from '../components/component-prop-target.js';
-export type MemoEvalLiteral = string | number | boolean | null;
-/**
- * A single entry in the memoEval deps array.
- *
- * - `'eval'` — a `$eval` code fragment. At deps-build time the fragment is
- *   evaluated under `self` (`new Function('self', …)` at runtime, spliced
- *   verbatim under `self => [...]` in codegen). `label` annotates codegen
- *   output (e.g. `/* $eval: Entity.instance *\/`).
- * - `'read'` — a read binding that resolves to `self[target]` at deps-build
- *   time.
- */
-export type MemoEvalDep = Branded<'MemoEvalDep', {
-    readonly kind: 'eval';
-    readonly code: string;
-    readonly label: string;
-} | {
-    readonly kind: 'read';
-    readonly target: string;
-}>;
-/**
- * Tree of values with slots referencing entries in the plan's `deps` array.
- * Generated by codegen as a JS literal with params spliced in, or by runtime
- * by walking and substituting from the `deps`-materialised values array.
- */
-export type MemoEvalTemplate = Branded<'MemoEvalTemplate', {
-    readonly kind: 'literal';
-    readonly value: MemoEvalLiteral;
-} | {
-    readonly kind: 'msg';
-    readonly marker: MsgMarker;
-} | {
-    readonly kind: 'slot';
-    readonly depIndex: number;
-} | {
-    readonly kind: 'array';
-    readonly items: readonly MemoEvalTemplate[];
-} | {
-    readonly kind: 'object';
-    readonly entries: ReadonlyArray<readonly [string, MemoEvalTemplate]>;
-}>;
-export type MemoEvalPlanInput = MemoEvalLiteral | EvalMarker | MsgMarker | ComponentPropTarget | MemoEvalPlanInputArray | MemoEvalPlanInputObject;
-export interface MemoEvalPlanInputArray extends ReadonlyArray<MemoEvalPlanInput> {
-}
-export interface MemoEvalPlanInputObject {
-    readonly [key: string]: MemoEvalPlanInput;
-}
-/**
- * Normalized plan for producing a memoized reader from a tree containing
- * `$eval`, `$target`, `$msg`, and literal nodes. Built once during spec
- * parsing; codegen + runtime both generate from the same plan so their outputs
- * cannot drift.
- *
- * - `deps` — ordered evaluation slots in first-seen walk order. Each slot
- *   dedupes (`$eval` by trimmed code, `$target` by name) so a repeated marker
- *   shares one dep.
- * - `template` — rebuilt value tree with `slot { depIndex }` nodes in place
- *   of the consumed markers.
- * - `usesSelf` — true when deps collection must receive `self`, either
- *   because a read dep exists or because an eval dep references `self`.
- *
- * When `deps` is empty the tree is fully static — generators cache
- * non-primitive templates and keep primitive literals as bare thunks.
- */
-export type MemoEvalPlan = Branded<'MemoEvalPlan', {
-    readonly deps: readonly MemoEvalDep[];
-    readonly template: MemoEvalTemplate;
-    readonly usesSelf: boolean;
-}>;
+import { type MemoEvalPlan as MemoEvalPlanData, type MemoEvalPlanInput } from '#package/domain';
+export type { MemoEvalLiteral, MemoEvalDep, MemoEvalTemplate, MemoEvalPlanInput, MemoEvalPlanInputArray, MemoEvalPlanInputObject, } from '#package/domain';
+/** The plan a memoized reader is built from; see {@link MemoEvalPlanData | MemoEvalPlan} in `domain`. */
+export type MemoEvalPlan = MemoEvalPlanData;
 /**
  * Builds a {@link MemoEvalPlan} from a value tree that may contain `$eval`,
  * `$target`, and `$msg` markers. Called during spec parsing from

package/dist/application-spec/parse-application-files/spec/expressions/memo-eval-plan.js

@@ -1 +1 @@
-import{Branded as e}from"@salsita-ai/common/utils";import{isEvalMarker as r,isMsgMarker as t}from"../../../core/index.js";import{evalCodeUsesSelf as n}from"../../../enhanced-json/eval-code-uses-self.js";import{isComponentPropTarget as o}from"../components/component-prop-target.js";let l=(e,r)=>0===r.length?e:`${e}.${r.join(".")}`,i=(n,a,d,u)=>{if(void 0===n)throw Error(`MemoEvalPlan: found undefined at ${l(d,u)}, undefined cannot be generated, remove the property or use null.`);if(r(n)){let r=((r,t,n)=>{let o=t.trim();for(let e=0;e<r.length;e++){let t=r[e];if("eval"===t.kind&&t.code===o)return e}return r.push(e({kind:"eval",code:o,label:n})),r.length-1})(a,n.$eval,d);return e({kind:"slot",depIndex:r})}if(o(n)){let r=((r,t)=>{for(let e=0;e<r.length;e++){let n=r[e];if("read"===n.kind&&n.target===t)return e}return r.push(e({kind:"read",target:t})),r.length-1})(a,n.$target);return e({kind:"slot",depIndex:r})}if(t(n))return e({kind:"msg",marker:n});if(null===n||"object"!=typeof n)return e({kind:"literal",value:n});if(Array.isArray(n))return e({kind:"array",items:n.map((e,r)=>i(e,a,d,[...u,String(r)]))});if("object"!=typeof n||null===n)throw Error(`MemoEvalPlan: found unsupported value at ${l(d,u)}, remove it or use null.`);let s=[];for(let e in n){let r=n[e];s.push([e,i(r,a,d,[...u,e])])}return e({kind:"object",entries:s})};export const MemoEvalPlan=(r,t)=>{let o=[],l=i(r,o,t,[]),a=o.some(e=>"read"===e.kind||n(e.code));return e({deps:o,template:l,usesSelf:a})};
+import{Branded as e}from"@salsita-ai/common/utils";import{isComponentPropTarget as r}from"#package/domain";import{isEvalMarker as t,isMsgMarker as n}from"../../../core/index.js";import{evalCodeUsesSelf as o}from"../../../enhanced-json/eval-code-uses-self.js";let l=(e,r)=>0===r.length?e:`${e}.${r.join(".")}`,i=(o,a,d,u)=>{if(void 0===o)throw Error(`MemoEvalPlan: found undefined at ${l(d,u)}, undefined cannot be generated, remove the property or use null.`);if(t(o)){let r=((r,t,n)=>{let o=t.trim();for(let e=0;e<r.length;e++){let t=r[e];if("eval"===t.kind&&t.code===o)return e}return r.push(e({kind:"eval",code:o,label:n})),r.length-1})(a,o.$eval,d);return e({kind:"slot",depIndex:r})}if(r(o)){let r=((r,t)=>{for(let e=0;e<r.length;e++){let n=r[e];if("read"===n.kind&&n.target===t)return e}return r.push(e({kind:"read",target:t})),r.length-1})(a,o.$target);return e({kind:"slot",depIndex:r})}if(n(o))return e({kind:"msg",marker:o});if(null===o||"object"!=typeof o)return e({kind:"literal",value:o});if(Array.isArray(o))return e({kind:"array",items:o.map((e,r)=>i(e,a,d,[...u,String(r)]))});if("object"!=typeof o||null===o)throw Error(`MemoEvalPlan: found unsupported value at ${l(d,u)}, remove it or use null.`);let f=[];for(let e in o){let r=o[e];f.push([e,i(r,a,d,[...u,e])])}return e({kind:"object",entries:f})};export const MemoEvalPlan=(r,t)=>{let n=[],l=i(r,n,t,[]),a=n.some(e=>"read"===e.kind||o(e.code));return e({deps:n,template:l,usesSelf:a})};

package/dist/application-spec/parse-application-files/spec/expressions/user-expressions.d.ts

@@ -1,7 +1,7 @@
+import type { SpecExpression } from '#package/domain';
 import { type EvalExpressionParser, type ParseContext } from '../../../core/index.js';
 import type { MergedExpressions } from '../../merge/index.js';
 import type { ModelTypeResolution, ModelVersion } from '../model/index.js';
-import type { Expression } from './expression.js';
 /**
  * Validates user-declared expressions from merged YAML.
  *
@@ -19,5 +19,5 @@ interface UserExpressionsContext {
     readonly typeResolution: ModelTypeResolution;
     readonly parsingContext: ParseContext;
 }
-export declare const UserExpressions: (rawExpressions: MergedExpressions, context: UserExpressionsContext) => readonly Expression[] | undefined;
+export declare const UserExpressions: (rawExpressions: MergedExpressions, context: UserExpressionsContext) => readonly SpecExpression[] | undefined;
 export {};