@@ -9,6 +9,7 @@ use crate::awaits::{is_handler, non_tail_awaits, view_readers};
99use crate :: check:: { children, unwrap_server, Node } ;
1010use crate :: js:: * ;
1111use crate :: modules:: ModuleSet ;
12+ use crate :: parse:: { JsDecl , Part , Shape as FShape } ;
1213use crate :: signature:: ExportSig ;
1314use indexmap:: { IndexMap , IndexSet } ;
1415use serde_json:: Value ;
@@ -41,6 +42,8 @@ enum Kind {
4142 Val ,
4243 Fn ,
4344 Ifn ,
45+ /// MO-10: a declared JS primitive
46+ Jfn ,
4447 Act ,
4548 Comp ,
4649}
@@ -58,9 +61,12 @@ struct Bind {
5861 prev : Option < String > ,
5962 /// `client` JS (12 SF-5b)
6063 client : bool ,
64+ /// MO-10: a primitive's result (Jfn), or an instance's (with `inst`, the name of its raw result)
65+ shape : Option < FShape > ,
66+ inst : Option < String > ,
6167}
6268fn bind ( kind : Kind , js : impl Into < String > ) -> Bind {
63- Bind { kind, js : js. into ( ) , w : None , f : None , prev : None , client : false }
69+ Bind { kind, js : js. into ( ) , w : None , f : None , prev : None , client : false , shape : None , inst : None }
6470}
6571fn val ( js : impl Into < String > ) -> Bind {
6672 bind ( Kind :: Val , js)
@@ -254,6 +260,11 @@ struct Gen<'p> {
254260 style_ids : u32 ,
255261}
256262
263+ /// MO-10: the scenario prelude's `./prims`, a JS module of Solid primitives (`ref/compile/prims-solid.ts`).
264+ fn is_prims ( from : & str ) -> bool {
265+ from == "prims" || from == "prims.js" || from. ends_with ( "/prims" ) || from. ends_with ( "/prims.js" )
266+ }
267+
257268impl < ' p > Gen < ' p > {
258269 /// A JS import that becomes a real ES import (MO-8): a package's always; a relative one too when the modules go to a
259270 /// bundler (`by_source`, the product), where `./util.js` is the app's own file. `./api` stays the app's injected API
@@ -608,8 +619,17 @@ impl<'p> Gen<'p> {
608619 for d in decls {
609620 match d {
610621 Decl :: Import { resolved : Some ( _) , .. } => { }
611- Decl :: Import { names, side, declared_side, .. } => {
622+ Decl :: Import { names, side, declared_side, declared , .. } => {
612623 for n in names {
624+ // MO-10a: a declared primitive
625+ let x = declared. as_ref ( ) . and_then ( |dp| self . set . declarations . get ( dp) ) . and_then ( |ds| ds. iter ( ) . find ( |y| y. name ( ) == n. name ) ) ;
626+ if let Some ( JsDecl :: Fn { params, refs, shape, instantiates : true , .. } ) = x {
627+ let mut b = bind ( Kind :: Jfn , mg ( & n. alias ) ) ;
628+ b. f = Some ( FnRef { params : params. iter ( ) . enumerate ( ) . map ( |( i, p) | ( p. clone ( ) , refs. get ( i) . copied ( ) . unwrap_or ( false ) ) ) . collect ( ) , decl : None } ) ;
629+ b. shape = Some ( shape. clone ( ) ) ;
630+ self . set ( env, & n. alias , b) ;
631+ continue ;
632+ }
613633 let mut b = val ( mg ( & n. alias ) ) ;
614634 b. client = * side == Some ( crate :: ast:: Side :: Client )
615635 || declared_side. as_ref ( ) . is_some_and ( |ds| ds. iter ( ) . any ( |( k, s) | * k == n. name && * s == crate :: ast:: Side :: Client ) ) ;
@@ -634,6 +654,14 @@ impl<'p> Gen<'p> {
634654 Decl :: Eq { name, e, .. } if unwrap_server ( e) . is_some ( ) => self . set ( env, name, val ( mg ( name) ) ) ,
635655 Decl :: Eq { name, e, deferred, .. } => {
636656 let mut b = bind ( Kind :: Acc , mg ( name) ) ;
657+ if let ExprKind :: Call { f, .. } = & e. k {
658+ if let ExprKind :: Id ( fname) = & f. k {
659+ if let Some ( jf) = self . lookup ( env, fname) . filter ( |x| x. kind == Kind :: Jfn ) {
660+ b. inst = Some ( format ! ( "r${name}" ) ) ;
661+ b. shape = jf. shape . clone ( ) ;
662+ }
663+ }
664+ }
637665 if self . guessed_eq ( name, e, * deferred) {
638666 b. w = Some ( format ! ( "w${name}" ) ) ;
639667 }
@@ -658,6 +686,9 @@ impl<'p> Gen<'p> {
658686 dot ( id ( "__B" ) , name)
659687 } else if from. ends_with ( "/api" ) {
660688 rtc ( "api" , vec ! [ str ( name. clone( ) ) ] )
689+ } else if is_prims ( from) {
690+ // MO-10: the scenario prelude's Solid primitives
691+ rtc ( "prim" , vec ! [ str ( name. clone( ) ) ] )
661692 } else {
662693 return fail ( format ! ( "{name} from \" {from}\" is not in the scenario prelude" ) ) ;
663694 } ;
@@ -1001,6 +1032,9 @@ impl<'p> Gen<'p> {
10011032 }
10021033 }
10031034 }
1035+ if let Some ( fx) = self . foreign ( e, env, & b) ? {
1036+ return fin ( fx, self ) ;
1037+ }
10041038 if let Some ( k) = key {
10051039 let x = self . expr ( e, env, & Ctx { tail : true , ..Ctx :: default ( ) } ) ?;
10061040 return fin ( vec ! [ konst( b. js. clone( ) , rtc( "keyed" , vec![ str ( name. clone( ) ) , str ( k. clone( ) ) , thunk( x) ] ) ) ] , self ) ;
@@ -1133,6 +1167,74 @@ impl<'p> Gen<'p> {
11331167 body. push ( S :: Return ( Some ( t) ) ) ;
11341168 Ok ( S :: Func ( Func { name : Some ( mg ( name) ) , params : ps, directives : vec ! [ ] , body, is_async : false , generator : false } ) )
11351169 }
1170+ /// MO-10: `x = f(…)` over a declared primitive — called once (RG-6), a ref argument as an accessor, a value one
1171+ /// untracked; and `y = x[i]` / `x.k` over its result. A `ref` part is bound to the accessor itself, any other part to
1172+ /// its value.
1173+ fn foreign ( & mut self , e : & Expr , env : Env , b : & Bind ) -> R < Option < Vec < S > > > {
1174+ fn part ( r : E , p : Part ) -> E {
1175+ if p == Part :: Ref {
1176+ r
1177+ } else {
1178+ thunk ( r)
1179+ }
1180+ }
1181+ let ix = |r : & str , k : E | E :: Index ( Box :: new ( id ( r) ) , Box :: new ( k) , false ) ;
1182+ match & e. k {
1183+ ExprKind :: Call { f, args } => {
1184+ let ExprKind :: Id ( fname) = & f. k else { return Ok ( None ) } ;
1185+ let Some ( fb) = self . lookup ( env, fname) . filter ( |x| x. kind == Kind :: Jfn ) else { return Ok ( None ) } ;
1186+ let refs: Vec < bool > = fb. f . as_ref ( ) . unwrap ( ) . params . iter ( ) . map ( |p| p. 1 ) . collect ( ) ;
1187+ let mut out = vec ! [ ] ;
1188+ for ( i, a) in args. iter ( ) . enumerate ( ) {
1189+ if !refs. get ( i) . copied ( ) . unwrap_or ( false ) {
1190+ out. push ( rtc ( "untrack" , vec ! [ thunk( self . expr( a, env, & reactive( ) ) ?) ] ) ) ;
1191+ continue ;
1192+ }
1193+ if let ExprKind :: Id ( n) = & a. k {
1194+ if let Some ( ab) = self . lookup ( env, n) . filter ( |ab| matches ! ( ab. kind, Kind :: Acc | Kind :: Src ) ) {
1195+ out. push ( id ( ab. js ) ) ;
1196+ continue ;
1197+ }
1198+ }
1199+ out. push ( rtc ( "memo" , vec ! [ E :: Null , thunk( self . expr( a, env, & reactive( ) ) ?) ] ) ) ;
1200+ }
1201+ let r = b. inst . clone ( ) . unwrap ( ) ;
1202+ let whole = match fb. shape . as_ref ( ) . unwrap ( ) {
1203+ FShape :: Part ( p) => part ( id ( r. clone ( ) ) , * p) ,
1204+ FShape :: Items ( items) => rtc (
1205+ "memo" ,
1206+ vec ! [ E :: Null , thunk( E :: Arr ( items. iter( ) . enumerate( ) . map( |( i, p) | { let x = ix( & r, E :: Num ( i as f64 ) ) ; if * p == Part :: Ref { call( x, vec![ ] ) } else { x } } ) . collect( ) ) ) ] ,
1207+ ) ,
1208+ FShape :: Fields ( fields) => rtc (
1209+ "memo" ,
1210+ vec ! [ E :: Null , thunk( E :: Obj ( fields. iter( ) . map( |( k, p) | { let x = ix( & r, str ( k. clone( ) ) ) ; Prop :: Kv ( Key :: Str ( k. clone( ) ) , if * p == Part :: Ref { call( x, vec![ ] ) } else { x } ) } ) . collect( ) ) ) ] ,
1211+ ) ,
1212+ } ;
1213+ Ok ( Some ( vec ! [ konst( r. clone( ) , call( id( fb. js. clone( ) ) , out) ) , konst( b. js. clone( ) , whole) ] ) )
1214+ }
1215+ ExprKind :: Index { o, .. } | ExprKind :: Member { o, .. } => {
1216+ let ExprKind :: Id ( on) = & o. k else { return Ok ( None ) } ;
1217+ let Some ( ob) = self . lookup ( env, on) else { return Ok ( None ) } ;
1218+ let ( Some ( inst) , Some ( sh) ) = ( ob. inst . clone ( ) , ob. shape . clone ( ) ) else { return Ok ( None ) } ;
1219+ let ( key, p) = match ( & e. k , & sh) {
1220+ ( ExprKind :: Index { i, .. } , FShape :: Items ( items) ) => match & i. k {
1221+ ExprKind :: Lit ( Lit :: Num ( v) ) if * v >= 0.0 && v. fract ( ) == 0.0 => match items. get ( * v as usize ) {
1222+ Some ( p) => ( E :: Num ( * v) , * p) ,
1223+ None => return Ok ( None ) ,
1224+ } ,
1225+ _ => return Ok ( None ) ,
1226+ } ,
1227+ ( ExprKind :: Member { p : k, .. } , FShape :: Fields ( fields) ) => match fields. iter ( ) . find ( |f| & f. 0 == k) {
1228+ Some ( f) => ( str ( k. clone ( ) ) , f. 1 ) ,
1229+ None => return Ok ( None ) ,
1230+ } ,
1231+ _ => return Ok ( None ) ,
1232+ } ;
1233+ Ok ( Some ( vec ! [ konst( b. js. clone( ) , part( ix( & inst, key) , p) ) ] ) )
1234+ }
1235+ _ => Ok ( None ) ,
1236+ }
1237+ }
11361238 fn instantiate ( & mut self , e : & Expr , env : Env ) -> R < E > {
11371239 let ExprKind :: Call { f, args } = & e. k else { unreachable ! ( ) } ;
11381240 let ExprKind :: Id ( fname) = & f. k else { unreachable ! ( ) } ;
0 commit comments