tutuca 0.9.78 → 0.9.79

package/dist/tutuca-extra.ext.js

@@ -474,6 +474,7 @@ var G_BOOL = K_FIELD | K_METHOD | K_BIND | K_DYN | K_CONST;
 var G_TEXT = G_BOOL | K_STRTPL;
 var G_COMPONENT = K_FIELD | K_SEQ | K_DYN;
 var G_SEQUENCE = K_FIELD | K_DYN;
+var G_PROVIDE = K_FIELD | K_SEQ;
 var G_FIELD = K_FIELD | K_METHOD | K_CONST | K_STR | K_SEQ;
 var G_VALUE = K_FIELD | K_METHOD | K_BIND | K_DYN | K_NAME | K_TYPE | K_REQUEST | K_CONST;
 var G_PRED_ARG = G_BOOL | K_STR;
@@ -592,6 +593,9 @@ class ValParser {
   parseField(s, px) {
     return this._parseSingle(s, px, G_FIELD);
   }
+  parseProvide(s, px) {
+    return this._parseSingle(s, px, G_PROVIDE);
+  }
   parseHandlerArg(s, px) {
     return this._parseSingle(s, px, G_HANDLER_ARG);
   }
@@ -1578,21 +1582,22 @@ function h(tagName, properties, children, namespace) {
 }
 
 // src/anode.js
-function resolveDynProducer(comp, dynName) {
-  const dyn = comp?.dynamic?.[dynName];
-  if (dyn == null)
-    return null;
-  let producerComp, producerDyn;
-  if (dyn.compName != null) {
-    producerComp = comp.scope?.lookupComponent(dyn.compName);
-    producerDyn = producerComp?.dynamic?.[dyn.dynName];
+function resolveDynProducer(comp, name) {
+  let producerComp, producerProvide;
+  const lk = comp?.lookup?.[name];
+  if (lk != null) {
+    producerComp = comp.scope?.lookupComponent(lk.compName);
+    producerProvide = producerComp?.provide?.[lk.provideName];
   } else {
+    const p = comp?.provide?.[name];
+    if (p == null)
+      return null;
     producerComp = comp;
-    producerDyn = dyn;
+    producerProvide = p;
   }
-  if (producerComp == null || producerDyn == null)
+  if (producerComp == null || producerProvide == null)
     return null;
-  const pi = producerDyn.val?.toPathItem?.() ?? null;
+  const pi = producerProvide.val?.toPathItem?.() ?? null;
   return { producerCompId: producerComp.id, producerSteps: pi ? [pi] : [] };
 }
 
@@ -2335,9 +2340,6 @@ class Components {
   getCompFor(v) {
     return v?.[this.getComponentSymbol]?.() ?? null;
   }
-  getOnEnterFor(v) {
-    return this.getCompFor(v)?.on.stackEnter ?? defaultOnStackEnter;
-  }
   getHandlerFor(v, name, key) {
     return this.getCompFor(v)?.[key][name] ?? null;
   }
@@ -2407,36 +2409,30 @@ class ComponentStack {
   }
 }
 
-class Dynamic {
+class ProvideInfo {
   constructor(name, val, symbol) {
     this.name = name;
     this.val = val;
     this.symbol = symbol;
   }
-  getSymbol(_stack) {
-    return this.symbol;
-  }
-  evalAndBind(stack, binds) {
-    binds[this.getSymbol(stack)] = this.val.eval(stack);
-  }
 }
 
-class DynamicAlias extends Dynamic {
-  constructor(name, val, compName, dynName) {
-    super(name, val, null);
+class LookupInfo {
+  constructor(name, compName, provideName, val) {
+    this.name = name;
     this.compName = compName;
-    this.dynName = dynName;
-  }
-  _resolveSymbol(stack) {
-    return stack.lookupType(this.compName)?.dynamic[this.dynName]?.symbol ?? null;
+    this.provideName = provideName;
+    this.val = val;
+    this._sym = undefined;
   }
-  getSymbol(stack) {
-    this.symbol ??= this._resolveSymbol(stack);
-    return this.symbol;
+  getProducerSymbol(stack) {
+    if (this._sym === undefined)
+      this._sym = stack.lookupType(this.compName)?.provide?.[this.provideName]?.symbol ?? null;
+    return this._sym;
   }
 }
 var isString = (v) => typeof v === "string";
-var _rawSpecKeys = "name view style commonStyle globalStyle input receive bubble response alter on views dynamic fields methods statics";
+var _rawSpecKeys = "name view style commonStyle globalStyle input receive bubble response alter views provide lookup fields methods statics";
 var KNOWN_SPEC_KEYS = new Set(_rawSpecKeys.split(" "));
 var _compId = 0;
 
@@ -2453,35 +2449,47 @@ class Component {
     this.bubble = o.bubble ?? {};
     this.response = o.response ?? {};
     this.alter = o.alter ?? {};
-    this.on = { stackEnter: o.on?.stackEnter ?? defaultOnStackEnter };
     for (const name in o.views ?? {}) {
       const v = o.views[name];
       const { view, style } = isString(v) ? { view: v } : v;
       this.views[name] = new View(name, view, style);
     }
-    this._rawDynamic = o.dynamic ?? {};
-    this.dynamic = {};
+    this._rawProvide = o.provide ?? {};
+    this._rawLookup = o.lookup ?? {};
+    this.provide = {};
+    this.lookup = {};
     this.scope = null;
+    this.spec = o;
     this.extra = {};
     for (const key of Object.keys(o))
       if (!KNOWN_SPEC_KEYS.has(key))
         this.extra[key] = o[key];
   }
+  clone() {
+    return Component.fromSpec(this.spec);
+  }
   compile(ParseContext2) {
     for (const name in this.views)
       this.views[name].compile(new ParseContext2, this.scope, this.id);
-    for (const key in this._rawDynamic) {
-      const dinfo = this._rawDynamic[key];
-      if (isString(dinfo)) {
-        const val = vp.parseField(dinfo, this.views.main.ctx);
-        this.dynamic[key] = new Dynamic(key, val, Symbol(key));
-      } else if (isString(dinfo?.default) && isString(dinfo?.for)) {
-        const val = vp.parseField(dinfo.default, this.views.main.ctx);
-        const [compName, dynName] = dinfo.for.split(".");
-        if (isString(compName) && isString(dynName))
-          this.dynamic[key] = new DynamicAlias(key, val, compName, dynName);
-      }
+    const ctx = this.views.main.ctx;
+    for (const key in this._rawProvide) {
+      const val = vp.parseProvide(this._rawProvide[key], ctx);
+      if (val)
+        this.provide[key] = new ProvideInfo(key, val, Symbol(key));
+    }
+    for (const key in this._rawLookup) {
+      const linfo = this._rawLookup[key];
+      const forStr = isString(linfo) ? linfo : isString(linfo?.for) ? linfo.for : null;
+      const [compName, provideName] = forStr === null ? [] : forStr.split(".");
+      if (!isString(compName) || !isString(provideName))
+        continue;
+      const defStr = isString(linfo?.default) ? linfo.default : null;
+      const val = defStr === null ? null : vp.parseField(defStr, ctx);
+      this.lookup[key] = new LookupInfo(key, compName, provideName, val);
     }
+    for (const key in this.lookup)
+      if (this.provide[key] !== undefined)
+        console.warn("name declared in both provide and lookup", this.name, key);
   }
   make(args, opts) {
     return this.Class.make(args, opts ?? { scope: this.scope });
@@ -2509,9 +2517,6 @@ class Component {
 `);
   }
 }
-function defaultOnStackEnter() {
-  return null;
-}
 
 // src/stack.js
 var STOP = Symbol("STOP");
@@ -2570,47 +2575,61 @@ class Stack {
     this.viewsId = viewsId;
     this.ctx = ctx;
   }
-  _enrichOnEnter() {
-    return this.withDynamicBinds(this.comps.getOnEnterFor(this.it).call(this.it));
+  _pushProvides() {
+    const provide = this.comps.getCompFor(this.it)?.provide;
+    if (provide == null)
+      return this;
+    const dynObj = {};
+    let has = false;
+    for (const k in provide) {
+      dynObj[provide[k].symbol] = provide[k].val.eval(this);
+      has = true;
+    }
+    if (!has)
+      return this;
+    const newDynBinds = [new ObjectFrame(dynObj), this.dynBinds];
+    const { comps, it, binds, views, viewsId, ctx } = this;
+    return new Stack(comps, it, binds, newDynBinds, views, viewsId, ctx);
   }
   static root(comps, it, ctx) {
     const binds = [new BindFrame(it, { it }, true), null];
     const dynBinds = [new ObjectFrame({}), null];
     const views = ["main", null];
-    return new Stack(comps, it, binds, dynBinds, views, "", ctx)._enrichOnEnter();
+    return new Stack(comps, it, binds, dynBinds, views, "", ctx)._pushProvides();
   }
   enter(it, bindings = {}, isFrame = true) {
     const { comps, binds, dynBinds, views, viewsId, ctx } = this;
     const newBinds = [new BindFrame(it, bindings, isFrame), binds];
     const stack = new Stack(comps, it, newBinds, dynBinds, views, viewsId, ctx);
-    return isFrame ? stack._enrichOnEnter() : stack;
+    return isFrame ? stack._pushProvides() : stack;
   }
   pushViewName(name) {
     const { comps, it, binds, dynBinds, views, ctx } = this;
     const newViews = [name, views];
     return new Stack(comps, it, binds, dynBinds, newViews, computeViewsId(newViews), ctx);
   }
-  withDynamicBinds(dynamics) {
-    if (dynamics == null || dynamics.length === 0)
-      return this;
-    const dynObj = {};
-    const comp = this.comps.getCompFor(this.it);
-    for (const dynName of dynamics)
-      comp.dynamic[dynName].evalAndBind(this, dynObj);
-    const newDynBinds = [new ObjectFrame(dynObj), this.dynBinds];
-    const { comps, it, binds, views, viewsId, ctx } = this;
-    return new Stack(comps, it, binds, newDynBinds, views, viewsId, ctx);
+  _pushDynBindValuesToArray(arr, comp) {
+    for (const k in comp.provide)
+      arr.push(this._lookupProvide(comp.provide[k]));
+    for (const k in comp.lookup)
+      arr.push(this._lookupAlias(comp.lookup[k]));
   }
-  _pushDynBindValuesToArray(arr, dyns) {
-    for (const k in dyns)
-      arr.push(this._lookupDynamicWithDynVal(dyns[k]));
+  _lookupProvide(p) {
+    return lookup(this.dynBinds, p.symbol) ?? p.val.eval(this) ?? null;
   }
-  _lookupDynamicWithDynVal(d) {
-    return lookup(this.dynBinds, d.getSymbol(this)) ?? d.val?.eval(this) ?? null;
+  _lookupAlias(lk) {
+    const sym = lk.getProducerSymbol(this);
+    return (sym != null ? lookup(this.dynBinds, sym) : null) ?? lk.val?.eval(this) ?? null;
   }
   lookupDynamic(name) {
-    const d = this.comps.getCompFor(this.it)?.dynamic[name];
-    return d ? this._lookupDynamicWithDynVal(d) : null;
+    const comp = this.comps.getCompFor(this.it);
+    if (comp == null)
+      return null;
+    const lk = comp.lookup[name];
+    if (lk !== undefined)
+      return this._lookupAlias(lk);
+    const p = comp.provide[name];
+    return p !== undefined ? this._lookupProvide(p) : null;
   }
   lookupBind(name) {
     return lookup(this.binds, name);
@@ -3702,7 +3721,8 @@ function classFromData(name, { fields = {}, methods, statics }) {
     b.statics(statics);
   return b.build();
 }
-var component = (opts) => new Component(classFromData(opts.name, opts), opts);
+Component.fromSpec = (opts) => new Component(classFromData(opts.name, opts), opts);
+var component = (opts) => Component.fromSpec(opts);
 
 // src/renderer.js
 import { isIndexed, isKeyed } from "immutable";
@@ -3824,7 +3844,7 @@ class Renderer {
   _rValComp(stack, val, comp, node, key, viewName) {
     const cacheKey = `${viewName ?? stack.viewsId ?? ""}-${key}`;
     const cachePath = [node, val];
-    stack._pushDynBindValuesToArray(cachePath, comp.dynamic);
+    stack._pushDynBindValuesToArray(cachePath, comp);
     const cachedNode = this.cache.get(cachePath, cacheKey);
     if (cachedNode)
       return cachedNode;

package/dist/tutuca-extra.js

@@ -4847,6 +4847,7 @@ var G_BOOL = K_FIELD | K_METHOD | K_BIND | K_DYN | K_CONST;
 var G_TEXT = G_BOOL | K_STRTPL;
 var G_COMPONENT = K_FIELD | K_SEQ | K_DYN;
 var G_SEQUENCE = K_FIELD | K_DYN;
+var G_PROVIDE = K_FIELD | K_SEQ;
 var G_FIELD = K_FIELD | K_METHOD | K_CONST | K_STR | K_SEQ;
 var G_VALUE = K_FIELD | K_METHOD | K_BIND | K_DYN | K_NAME | K_TYPE | K_REQUEST | K_CONST;
 var G_PRED_ARG = G_BOOL | K_STR;
@@ -4965,6 +4966,9 @@ class ValParser {
   parseField(s, px) {
     return this._parseSingle(s, px, G_FIELD);
   }
+  parseProvide(s, px) {
+    return this._parseSingle(s, px, G_PROVIDE);
+  }
   parseHandlerArg(s, px) {
     return this._parseSingle(s, px, G_HANDLER_ARG);
   }
@@ -5951,21 +5955,22 @@ function h(tagName, properties, children, namespace) {
 }
 
 // src/anode.js
-function resolveDynProducer(comp, dynName) {
-  const dyn = comp?.dynamic?.[dynName];
-  if (dyn == null)
-    return null;
-  let producerComp, producerDyn;
-  if (dyn.compName != null) {
-    producerComp = comp.scope?.lookupComponent(dyn.compName);
-    producerDyn = producerComp?.dynamic?.[dyn.dynName];
+function resolveDynProducer(comp, name) {
+  let producerComp, producerProvide;
+  const lk = comp?.lookup?.[name];
+  if (lk != null) {
+    producerComp = comp.scope?.lookupComponent(lk.compName);
+    producerProvide = producerComp?.provide?.[lk.provideName];
   } else {
+    const p = comp?.provide?.[name];
+    if (p == null)
+      return null;
     producerComp = comp;
-    producerDyn = dyn;
+    producerProvide = p;
   }
-  if (producerComp == null || producerDyn == null)
+  if (producerComp == null || producerProvide == null)
     return null;
-  const pi = producerDyn.val?.toPathItem?.() ?? null;
+  const pi = producerProvide.val?.toPathItem?.() ?? null;
   return { producerCompId: producerComp.id, producerSteps: pi ? [pi] : [] };
 }
 
@@ -6708,9 +6713,6 @@ class Components {
   getCompFor(v) {
     return v?.[this.getComponentSymbol]?.() ?? null;
   }
-  getOnEnterFor(v) {
-    return this.getCompFor(v)?.on.stackEnter ?? defaultOnStackEnter;
-  }
   getHandlerFor(v, name, key) {
     return this.getCompFor(v)?.[key][name] ?? null;
   }
@@ -6780,36 +6782,30 @@ class ComponentStack {
   }
 }
 
-class Dynamic {
+class ProvideInfo {
   constructor(name, val, symbol) {
     this.name = name;
     this.val = val;
     this.symbol = symbol;
   }
-  getSymbol(_stack) {
-    return this.symbol;
-  }
-  evalAndBind(stack, binds) {
-    binds[this.getSymbol(stack)] = this.val.eval(stack);
-  }
 }
 
-class DynamicAlias extends Dynamic {
-  constructor(name, val, compName, dynName) {
-    super(name, val, null);
+class LookupInfo {
+  constructor(name, compName, provideName, val) {
+    this.name = name;
     this.compName = compName;
-    this.dynName = dynName;
-  }
-  _resolveSymbol(stack) {
-    return stack.lookupType(this.compName)?.dynamic[this.dynName]?.symbol ?? null;
+    this.provideName = provideName;
+    this.val = val;
+    this._sym = undefined;
   }
-  getSymbol(stack) {
-    this.symbol ??= this._resolveSymbol(stack);
-    return this.symbol;
+  getProducerSymbol(stack) {
+    if (this._sym === undefined)
+      this._sym = stack.lookupType(this.compName)?.provide?.[this.provideName]?.symbol ?? null;
+    return this._sym;
   }
 }
 var isString = (v) => typeof v === "string";
-var _rawSpecKeys = "name view style commonStyle globalStyle input receive bubble response alter on views dynamic fields methods statics";
+var _rawSpecKeys = "name view style commonStyle globalStyle input receive bubble response alter views provide lookup fields methods statics";
 var KNOWN_SPEC_KEYS = new Set(_rawSpecKeys.split(" "));
 var _compId = 0;
 
@@ -6826,35 +6822,47 @@ class Component {
     this.bubble = o.bubble ?? {};
     this.response = o.response ?? {};
     this.alter = o.alter ?? {};
-    this.on = { stackEnter: o.on?.stackEnter ?? defaultOnStackEnter };
     for (const name in o.views ?? {}) {
       const v = o.views[name];
       const { view, style } = isString(v) ? { view: v } : v;
       this.views[name] = new View(name, view, style);
     }
-    this._rawDynamic = o.dynamic ?? {};
-    this.dynamic = {};
+    this._rawProvide = o.provide ?? {};
+    this._rawLookup = o.lookup ?? {};
+    this.provide = {};
+    this.lookup = {};
     this.scope = null;
+    this.spec = o;
     this.extra = {};
     for (const key of Object.keys(o))
       if (!KNOWN_SPEC_KEYS.has(key))
         this.extra[key] = o[key];
   }
+  clone() {
+    return Component.fromSpec(this.spec);
+  }
   compile(ParseContext2) {
     for (const name in this.views)
       this.views[name].compile(new ParseContext2, this.scope, this.id);
-    for (const key in this._rawDynamic) {
-      const dinfo = this._rawDynamic[key];
-      if (isString(dinfo)) {
-        const val = vp.parseField(dinfo, this.views.main.ctx);
-        this.dynamic[key] = new Dynamic(key, val, Symbol(key));
-      } else if (isString(dinfo?.default) && isString(dinfo?.for)) {
-        const val = vp.parseField(dinfo.default, this.views.main.ctx);
-        const [compName, dynName] = dinfo.for.split(".");
-        if (isString(compName) && isString(dynName))
-          this.dynamic[key] = new DynamicAlias(key, val, compName, dynName);
-      }
+    const ctx = this.views.main.ctx;
+    for (const key in this._rawProvide) {
+      const val = vp.parseProvide(this._rawProvide[key], ctx);
+      if (val)
+        this.provide[key] = new ProvideInfo(key, val, Symbol(key));
+    }
+    for (const key in this._rawLookup) {
+      const linfo = this._rawLookup[key];
+      const forStr = isString(linfo) ? linfo : isString(linfo?.for) ? linfo.for : null;
+      const [compName, provideName] = forStr === null ? [] : forStr.split(".");
+      if (!isString(compName) || !isString(provideName))
+        continue;
+      const defStr = isString(linfo?.default) ? linfo.default : null;
+      const val = defStr === null ? null : vp.parseField(defStr, ctx);
+      this.lookup[key] = new LookupInfo(key, compName, provideName, val);
     }
+    for (const key in this.lookup)
+      if (this.provide[key] !== undefined)
+        console.warn("name declared in both provide and lookup", this.name, key);
   }
   make(args, opts) {
     return this.Class.make(args, opts ?? { scope: this.scope });
@@ -6882,9 +6890,6 @@ class Component {
 `);
   }
 }
-function defaultOnStackEnter() {
-  return null;
-}
 
 // src/stack.js
 var STOP = Symbol("STOP");
@@ -6943,47 +6948,61 @@ class Stack2 {
     this.viewsId = viewsId;
     this.ctx = ctx;
   }
-  _enrichOnEnter() {
-    return this.withDynamicBinds(this.comps.getOnEnterFor(this.it).call(this.it));
+  _pushProvides() {
+    const provide = this.comps.getCompFor(this.it)?.provide;
+    if (provide == null)
+      return this;
+    const dynObj = {};
+    let has2 = false;
+    for (const k in provide) {
+      dynObj[provide[k].symbol] = provide[k].val.eval(this);
+      has2 = true;
+    }
+    if (!has2)
+      return this;
+    const newDynBinds = [new ObjectFrame(dynObj), this.dynBinds];
+    const { comps, it, binds, views, viewsId, ctx } = this;
+    return new Stack2(comps, it, binds, newDynBinds, views, viewsId, ctx);
   }
   static root(comps, it, ctx) {
     const binds = [new BindFrame(it, { it }, true), null];
     const dynBinds = [new ObjectFrame({}), null];
     const views = ["main", null];
-    return new Stack2(comps, it, binds, dynBinds, views, "", ctx)._enrichOnEnter();
+    return new Stack2(comps, it, binds, dynBinds, views, "", ctx)._pushProvides();
   }
   enter(it, bindings = {}, isFrame = true) {
     const { comps, binds, dynBinds, views, viewsId, ctx } = this;
     const newBinds = [new BindFrame(it, bindings, isFrame), binds];
     const stack = new Stack2(comps, it, newBinds, dynBinds, views, viewsId, ctx);
-    return isFrame ? stack._enrichOnEnter() : stack;
+    return isFrame ? stack._pushProvides() : stack;
   }
   pushViewName(name) {
     const { comps, it, binds, dynBinds, views, ctx } = this;
     const newViews = [name, views];
     return new Stack2(comps, it, binds, dynBinds, newViews, computeViewsId(newViews), ctx);
   }
-  withDynamicBinds(dynamics) {
-    if (dynamics == null || dynamics.length === 0)
-      return this;
-    const dynObj = {};
-    const comp = this.comps.getCompFor(this.it);
-    for (const dynName of dynamics)
-      comp.dynamic[dynName].evalAndBind(this, dynObj);
-    const newDynBinds = [new ObjectFrame(dynObj), this.dynBinds];
-    const { comps, it, binds, views, viewsId, ctx } = this;
-    return new Stack2(comps, it, binds, newDynBinds, views, viewsId, ctx);
+  _pushDynBindValuesToArray(arr, comp) {
+    for (const k in comp.provide)
+      arr.push(this._lookupProvide(comp.provide[k]));
+    for (const k in comp.lookup)
+      arr.push(this._lookupAlias(comp.lookup[k]));
   }
-  _pushDynBindValuesToArray(arr, dyns) {
-    for (const k in dyns)
-      arr.push(this._lookupDynamicWithDynVal(dyns[k]));
+  _lookupProvide(p) {
+    return lookup(this.dynBinds, p.symbol) ?? p.val.eval(this) ?? null;
   }
-  _lookupDynamicWithDynVal(d) {
-    return lookup(this.dynBinds, d.getSymbol(this)) ?? d.val?.eval(this) ?? null;
+  _lookupAlias(lk) {
+    const sym = lk.getProducerSymbol(this);
+    return (sym != null ? lookup(this.dynBinds, sym) : null) ?? lk.val?.eval(this) ?? null;
   }
   lookupDynamic(name) {
-    const d = this.comps.getCompFor(this.it)?.dynamic[name];
-    return d ? this._lookupDynamicWithDynVal(d) : null;
+    const comp = this.comps.getCompFor(this.it);
+    if (comp == null)
+      return null;
+    const lk = comp.lookup[name];
+    if (lk !== undefined)
+      return this._lookupAlias(lk);
+    const p = comp.provide[name];
+    return p !== undefined ? this._lookupProvide(p) : null;
   }
   lookupBind(name) {
     return lookup(this.binds, name);
@@ -8071,7 +8090,8 @@ function classFromData(name, { fields = {}, methods, statics }) {
     b.statics(statics);
   return b.build();
 }
-var component = (opts) => new Component(classFromData(opts.name, opts), opts);
+Component.fromSpec = (opts) => new Component(classFromData(opts.name, opts), opts);
+var component = (opts) => Component.fromSpec(opts);
 
 // src/cache.js
 class NullDomCache {
@@ -8190,7 +8210,7 @@ class Renderer {
   _rValComp(stack, val, comp, node, key, viewName) {
     const cacheKey = `${viewName ?? stack.viewsId ?? ""}-${key}`;
     const cachePath = [node, val];
-    stack._pushDynBindValuesToArray(cachePath, comp.dynamic);
+    stack._pushDynBindValuesToArray(cachePath, comp);
     const cachedNode = this.cache.get(cachePath, cacheKey);
     if (cachedNode)
       return cachedNode;