@salsita-ai/sdk 0.50.0-develop.b7caacb493 → 0.50.0-develop.b929a82a82

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 {};

package/dist/application-spec/parse-application-files/spec/invariants/invariant.d.ts

@@ -1,23 +1,7 @@
-import { Branded } from '@salsita-ai/common/utils';
-import type { MsgMarker, ParseContext } from '../../../core/index.js';
+import type { SpecInvariant } from '#package/domain';
+import type { ParseContext } from '../../../core/index.js';
 import type { RawInvariantEntry } from '../../raw-spec/index.js';
-import { InvariantName, ViolationTypeName } from '../model/index.js';
-export type InvariantSeverity = 'fatal' | 'fixable' | 'warning' | 'notice';
-/** A YAML invariant whose violation metadata is fully declared in the application spec. */
-export type StaticInvariant = Branded<'StaticInvariant', {
-    readonly kind: 'static';
-    readonly name: InvariantName;
-    readonly violationType: ViolationTypeName;
-    readonly severity: InvariantSeverity;
-    readonly message: string | MsgMarker;
-    readonly controlViolationPriority?: number;
-}>;
-/** A YAML invariant whose implementation may return any of the declared violation types. */
-export type DynamicInvariant = Branded<'DynamicInvariant', {
-    readonly kind: 'dynamic';
-    readonly name: InvariantName;
-    readonly violationTypes: readonly ViolationTypeName[];
-}>;
-/** A validated static or dynamic invariant declaration. */
-export type Invariant = StaticInvariant | DynamicInvariant;
+export type { InvariantSeverity, StaticInvariant, DynamicInvariant } from '#package/domain';
+/** A validated static or dynamic invariant declaration; see {@link SpecInvariant} in `domain`. */
+export type Invariant = SpecInvariant;
 export declare const Invariant: (rawName: string, entry: RawInvariantEntry, ctx: ParseContext) => Invariant | undefined;

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

@@ -1,19 +1,9 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { Invariants as InvariantsData } from '#package/domain';
 import type { ParseContext, PhoenixDefinitions } from '../../../core/index.js';
 import type { MergedComponents, MergedExpressions, MergedInvariants, MergedRelations } from '../../merge/index.js';
-import type { ComponentEntry } from '../components/index.js';
-import type { Expression } from '../expressions/index.js';
-import type { EntityOrAliasName, InvariantName, ModelVersion } from '../model/index.js';
-import { Invariant } from './invariant.js';
-/**
- * Validated invariants and the expressions/components they contribute to the application spec.
- * Entries retain their entity-or-alias declaration keys while artifacts expand to concrete entity types.
- */
-export type Invariants = Branded<'Invariants', {
-    readonly entries: Readonly<Record<EntityOrAliasName, Readonly<Record<InvariantName, Invariant>>>>;
-    readonly expressions: readonly Expression[];
-    readonly components: readonly ComponentEntry[];
-}>;
+import type { ModelVersion } from '../model/index.js';
+/** The validated invariants of a domain; see {@link InvariantsData | Invariants} in `domain`. */
+export type Invariants = InvariantsData;
 interface InvariantsProps {
     readonly rawInvariants: MergedInvariants;
     readonly rawExpressions: MergedExpressions;

package/dist/application-spec/parse-application-files/spec/model/aliases.d.ts

@@ -1,16 +1,10 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { SpecAliases } from '#package/domain';
 import type { ParseContext } from '../../../core/index.js';
 import type { MergedModelVersion } from '../../merge/index.js';
 import type { EntityTypes } from './entity-types.js';
 import { AliasName } from './names/alias-name.js';
-import type { EntityTypeName } from './names/entity-type-name.js';
-/**
- * Flattened alias map — each alias name maps to the concrete entity types it resolves to.
- * Nested aliases (e.g. AllLegs → [SteelLegs, LegsOak] where SteelLegs is itself an alias)
- * are fully resolved to leaf entity types. Includes the synthetic "AnyDomainEntity" alias
- * that maps to all entity types in the version.
- */
-export type Aliases = Branded<'Aliases', ReadonlyMap<AliasName, readonly EntityTypeName[]>>;
+/** The flattened alias map of a model version; see {@link SpecAliases} in `domain`. */
+export type Aliases = SpecAliases;
 /** Well-known alias name for root entity types — required in every model version. */
 export declare const ROOT_ENTITY_ALIAS: AliasName;
 export declare const Aliases: (merged: MergedModelVersion, entityTypes: EntityTypes, ctx: ParseContext) => Aliases | undefined;

package/dist/application-spec/parse-application-files/spec/model/common-types.d.ts

@@ -1,18 +1,10 @@
-import { Branded } from '@salsita-ai/common/utils';
-import { type EnhancedJsonSchemaType, type JsonSchema, type ParseContext, type PhoenixDefinitions } from '../../../core/index.js';
+import type { CommonType as CommonTypeData, CommonTypes as CommonTypesData } from '#package/domain';
+import { type ParseContext, type PhoenixDefinitions } from '../../../core/index.js';
 import type { MergedModelVersion } from '../../merge/index.js';
-/** A single common type definition with both enhanced schema (for type inference) and resolved runtime schema. */
-export type CommonType = Branded<'CommonType', {
-    readonly name: string;
-    readonly schema: EnhancedJsonSchemaType;
-    readonly runtimeSchema: JsonSchema;
-}>;
-/**
- * Branded map of common type name to CommonType.
- * Entries are in topo-sorted order (dependencies before dependents),
- * so iterating the map yields types in valid emission order.
- */
-export type CommonTypes = Branded<'CommonTypes', ReadonlyMap<string, CommonType>>;
+/** A common type with its enhanced and runtime schemas; see {@link CommonTypeData | CommonType} in `domain`. */
+export type CommonType = CommonTypeData;
+/** The common types of a model version by name; see {@link CommonTypesData | CommonTypes} in `domain`. */
+export type CommonTypes = CommonTypesData;
 /**
  * Validates, topo-sorts, and resolves commonType entries from the merged model version.
  *

package/dist/application-spec/parse-application-files/spec/model/defaults.d.ts

@@ -1,37 +1,12 @@
-import { Branded } from '@salsita-ai/common/utils';
-import { type EnhancedJsonValue, type ParseContext } from '../../../core/index.js';
+import type { Defaults as DefaultsData } from '#package/domain';
+import { type ParseContext } from '../../../core/index.js';
 import type { MergedDefaults } from '../../merge/index.js';
 import type { ModelVersion } from './model-version.js';
-import type { EntityTypeName } from './names/entity-type-name.js';
-import { ShapePropertyName } from './names/shape-property-name.js';
+export type { DefaultEntries } from '#package/domain';
 /**
- * A map of shape property names to their default values inside a single entity block.
- * Raw YAML values — markers intact — keyed by a validated {@link ShapePropertyName}.
- * Codegen emits these as-is via `stringifyEnhancedJsonValue`; at run time
- * `createRecipeFactory` makes the generated `createRecipe` factory from them.
- */
-export type DefaultEntries = Readonly<Record<ShapePropertyName, EnhancedJsonValue>>;
-/**
- * Validated defaults map — source keys confirmed to exist in `model.latest`,
- * property names confirmed to exist on the (effective) shape of the entity
- * or on every alias member's effective shape, values type-checked against the
- * relaxed entity shape (all properties optional). Alias-keyed defaults are
- * flattened here to concrete entity entries so downstream codegen only serialises
- * a runtime-ready per-entity map.
- *
- * A source key may state part of a shape, but the flattened entry of a concrete
- * entity type states every property of its shape: `createRecipeFactory` validates
- * each entry as a whole entity when the generated module loads. An entity type
- * with no entry has no defaults and is not checked.
- *
- * Values are raw `EnhancedJsonValue` so codegen can emit them via
- * `stringifyEnhancedJsonValue` with `$msg` markers preserved.
+ * The validated defaults of a domain by entity type; see {@link DefaultsData | Defaults} in `domain`.
  *
- * **Deprecated feature.** The whole defaults surface is retained for legacy parity.
- * New specs should express initial values as `$data` entries. When the merged map is
- * non-empty, the factory emits a `DEFAULTS_DEPRECATED` warning.
+ * **Deprecated feature.** New specs express initial values as `$data` entries.
  */
-export type Defaults = Branded<'Defaults', {
-    readonly entries: Readonly<Record<EntityTypeName, DefaultEntries>>;
-}>;
+export type Defaults = DefaultsData;
 export declare const Defaults: (merged: MergedDefaults, latestModel: ModelVersion, ctx: ParseContext) => Defaults | undefined;

package/dist/application-spec/parse-application-files/spec/model/entity-types.d.ts

@@ -1,13 +1,8 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { EntityTypes as EntityTypesData } from '#package/domain';
 import type { ParseContext } from '../../../core/index.js';
 import type { MergedModelVersion } from '../../merge/index.js';
-import { EntityTypeName } from './names/entity-type-name.js';
-/**
- * Validated list of entity type names declared in a model version (e.g. [Table, TopCircle, Legs3D]).
- * Entity types are the concrete domain objects that can be instantiated in the configurator.
- * Each name must be unique PascalCase.
- */
-export type EntityTypes = Branded<'EntityTypes', readonly EntityTypeName[]>;
+/** The entity type names a model version declares; see {@link EntityTypesData | EntityTypes} in `domain`. */
+export type EntityTypes = EntityTypesData;
 /**
  * Validates and brands entity type names from a merged model version.
  * Checks PascalCase naming and rejects duplicates.

package/dist/application-spec/parse-application-files/spec/model/model-version-key.d.ts

@@ -1,6 +1,6 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { ModelVersionKey as ModelVersionKeyData } from '#package/domain';
 import type { ParseContext } from '../../../core/index.js';
-/** Branded string for a model version key ("latest", "v1", "v2", etc.). */
-export type ModelVersionKey = Branded<'ModelVersionKey', string>;
+/** A model version key (`latest`, `v1`, `v2`, …); see {@link ModelVersionKeyData | ModelVersionKey} in `domain`. */
+export type ModelVersionKey = ModelVersionKeyData;
 /** Validates that a version key is "latest" or "v{N}" (e.g. "v1", "v2"). */
 export declare const ModelVersionKey: (key: string, ctx: ParseContext) => ModelVersionKey | undefined;

package/dist/application-spec/parse-application-files/spec/model/names/action-name.d.ts

@@ -1,10 +1,6 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { ActionName as ActionNameData } from '#package/domain';
 import type { ParseContext } from '../../../../core/index.js';
-/**
- * Branded action name: camelCase without a prefix (e.g. "movePartBy", "swapCabinets"). An action is
- * a named domain operation, so its name doubles as the key of its implementation and of its
- * generated types.
- */
-export type ActionName = Branded<'ActionName', string>;
+/** A branded action name; see {@link ActionNameData | ActionName} in `domain`. */
+export type ActionName = ActionNameData;
 /** Validates that a name follows the action naming convention (camelCase, no prefix). */
 export declare const ActionName: (name: string, ctx: ParseContext) => ActionName | undefined;

package/dist/application-spec/parse-application-files/spec/model/names/alias-name.d.ts

@@ -1,11 +1,7 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { AliasName as AliasNameData } from '#package/domain';
 import type { ParseContext } from '../../../../core/index.js';
-/**
- * Branded PascalCase alias name (e.g. "RootEntity", "AllLegs").
- * Aliases group entity types so that shapes, expressions, and rules can target
- * multiple entities at once. "RootEntity" is required in every model version.
- */
-export type AliasName = Branded<'AliasName', string>;
+/** A branded alias name; see {@link AliasNameData | AliasName} in `domain`. */
+export type AliasName = AliasNameData;
 export declare const RESERVED_ALIAS_NAMES: readonly ['AnyDomainEntity'];
 /** Validates PascalCase naming and rejects reserved names (AnyDomainEntity). */
 export declare const AliasName: (name: string, ctx: ParseContext) => AliasName | undefined;

package/dist/application-spec/parse-application-files/spec/model/names/entity-or-alias-name.d.ts

@@ -1,11 +1,6 @@
+import type { EntityOrAliasName as EntityOrAliasNameData } from '#package/domain';
 import type { ParseContext } from '../../../../core/index.js';
-import { AliasName } from './alias-name.js';
-import { EntityTypeName } from './entity-type-name.js';
-/**
- * A PascalCase name that identifies either a concrete entity type (e.g. "Table")
- * or an alias group (e.g. "RootEntity"). Used as shape keys since shapes
- * can be defined for both entity types and aliases.
- */
-export type EntityOrAliasName = EntityTypeName | AliasName;
+/** The name of an entity type or an alias; see {@link EntityOrAliasNameData | EntityOrAliasName} in `domain`. */
+export type EntityOrAliasName = EntityOrAliasNameData;
 /** Validates that a name is valid PascalCase for either an entity type or alias. */
 export declare const EntityOrAliasName: (name: string, ctx: ParseContext) => EntityOrAliasName | undefined;

package/dist/application-spec/parse-application-files/spec/model/names/entity-type-name.d.ts

@@ -1,11 +1,6 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { EntityTypeName as EntityTypeNameData } from '#package/domain';
 import type { ParseContext } from '../../../../core/index.js';
-/**
- * Branded PascalCase entity type name (e.g. "Table", "TopCircle", "Legs3D").
- * Entity types are the concrete domain objects declared in a model version.
- * Each entity type can have shapes, be referenced by aliases, and be instantiated
- * in the configurator at runtime.
- */
-export type EntityTypeName = Branded<'EntityTypeName', string>;
+/** A branded entity type name; see {@link EntityTypeNameData | EntityTypeName} in `domain`. */
+export type EntityTypeName = EntityTypeNameData;
 /** Validates that a name is PascalCase for use as an entity type identifier. */
 export declare const EntityTypeName: (name: string, ctx: ParseContext) => EntityTypeName | undefined;

package/dist/application-spec/parse-application-files/spec/model/names/expression-name.d.ts

@@ -1,9 +1,6 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { ExpressionName as ExpressionNameData } from '#package/domain';
 import type { ParseContext } from '../../../../core/index.js';
-/**
- * Branded expression name starting with $ followed by camelCase (e.g. "$price", "$isValid", "$availableColors").
- * Expressions are computed properties on entities — their names are prefixed with $ to distinguish them from shape properties.
- */
-export type ExpressionName = Branded<'ExpressionName', string>;
+/** A branded expression name; see {@link ExpressionNameData | ExpressionName} in `domain`. */
+export type ExpressionName = ExpressionNameData;
 /** Validates that a name follows the expression naming convention ($camelCase). */
 export declare const ExpressionName: (name: string, ctx: ParseContext) => ExpressionName | undefined;

package/dist/application-spec/parse-application-files/spec/model/names/instance-name.d.ts

@@ -1,9 +1,5 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { InstanceName as InstanceNameData } from '#package/domain';
 import type { ParseContext } from '../../../../core/index.js';
-/**
- * Branded component instance name.
- * User-declared names must start with a letter (e.g. "default", "body", "main").
- * SDK-derived names may include `$` prefix and `.` separators (e.g. "$top", "Table.$top").
- */
-export type InstanceName = Branded<'InstanceName', string>;
+/** A branded component instance name; see {@link InstanceNameData | InstanceName} in `domain`. */
+export type InstanceName = InstanceNameData;
 export declare const InstanceName: (name: string, entityKey: string, componentName: string, ctx: ParseContext) => InstanceName | undefined;

package/dist/application-spec/parse-application-files/spec/model/names/invariant-name.d.ts

@@ -1,5 +1,5 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { InvariantName as InvariantNameData } from '#package/domain';
 import type { ParseContext } from '../../../../core/index.js';
-/** A camelCase identifier for an invariant implementation declared in YAML. */
-export type InvariantName = Branded<'InvariantName', string>;
+/** A branded invariant name; see {@link InvariantNameData | InvariantName} in `domain`. */
+export type InvariantName = InvariantNameData;
 export declare const InvariantName: (name: string, ctx: ParseContext) => InvariantName | undefined;

package/dist/application-spec/parse-application-files/spec/model/names/shape-property-name.d.ts

@@ -1,15 +1,7 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { ShapePropertyName as ShapePropertyNameData } from '#package/domain';
 import { ParseContext } from '../../../../core/index.js';
-/**
- * Branded shape property name — the key under which an entity shape (or
- * alias shape) declares a field, and the key under which `defaults:` attaches
- * initial values. Must match /^[a-z]\w*$/: start with a lowercase letter,
- * then word characters (letters, digits, underscore).
- *
- * Examples: `height`, `positionX`, `hoodId`. Rejected: `Height`, `$height`,
- * `3D`, `height-px`.
- */
-export type ShapePropertyName = Branded<'ShapePropertyName', string>;
+/** A branded shape property name; see {@link ShapePropertyNameData | ShapePropertyName} in `domain`. */
+export type ShapePropertyName = ShapePropertyNameData;
 /** Validates `name` as a shape property identifier. Emits `INVALID_SHAPE_PROPERTY_NAME` on failure. */
 export declare const ShapePropertyName: (name: string, ctx: ParseContext) => ShapePropertyName | undefined;
 /**

package/dist/application-spec/parse-application-files/spec/model/names/violation-type-name.d.ts

@@ -1,5 +1,5 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { ViolationTypeName as ViolationTypeNameData } from '#package/domain';
 import type { ParseContext } from '../../../../core/index.js';
-/** A stable violation discriminator returned by an invariant. */
-export type ViolationTypeName = Branded<'ViolationTypeName', string>;
+/** A branded violation type name; see {@link ViolationTypeNameData | ViolationTypeName} in `domain`. */
+export type ViolationTypeName = ViolationTypeNameData;
 export declare const ViolationTypeName: (name: string, ctx: ParseContext) => ViolationTypeName | undefined;

package/dist/application-spec/parse-application-files/spec/model/presets.d.ts

@@ -1,37 +1,14 @@
-import { Branded } from '@salsita-ai/common/utils';
+import type { Presets as PresetsData, SpecPreset } from '#package/domain';
 import type { ParseContext } from '../../../core/index.js';
 import type { MergedPresets } from '../../merge/index.js';
 import type { RawPreset } from '../../raw-spec/index.js';
 import type { Relations } from '../relations/index.js';
 import type { ModelVersion } from './model-version.js';
-/**
- * A single entity within a preset — id, type, and shape properties.
- * Properties are validated against the entity's schema from ConfigurationSchema.
- */
-export type PresetEntity = Branded<'PresetEntity', {
-    readonly id: string;
-    readonly type: string;
-    readonly properties: Readonly<Record<string, unknown>>;
-}>;
-/**
- * A single parsed preset — the root entity type, initial entities, and optional metadata.
- * Represents one initial configuration state for a configurator deployment.
- */
-export type Preset = Branded<'Preset', {
-    readonly rootEntityType: string;
-    readonly initialDomainEntities: readonly PresetEntity[];
-    readonly name?: string;
-    readonly description?: string;
-    readonly img?: string;
-    readonly imgAlt?: string;
-    readonly detailTitle?: string;
-    readonly detailDescription?: string;
-    readonly tags?: readonly string[];
-}>;
-/** All parsed presets for a parsed configurator or admin model. */
-export type Presets = Branded<'Presets', {
-    readonly presets: readonly Preset[];
-}>;
+export type { PresetEntity } from '#package/domain';
+/** The parsed preset; see {@link SpecPreset} in `domain`. */
+export type Preset = SpecPreset;
+/** The parsed presets of a domain; see {@link PresetsData | Presets} in `domain`. */
+export type Presets = PresetsData;
 export declare const Preset: (raw: RawPreset, latestModel: ModelVersion, relations: Relations, ctx: ParseContext) => Preset | undefined;
 /**
  * Parses and validates merged presets against the domain model.