tutuca 0.9.57 → 0.9.58

package/dist/tutuca-cli.js

@@ -3864,6 +3864,9 @@ class Step {
   enterFrame(stack, _prev, next) {
     return stack.enter(next, {}, true);
   }
+  toAbstractPathStep() {
+    return this;
+  }
 }
 
 class Path {
@@ -3876,6 +3879,15 @@ class Path {
   popStep() {
     return new Path(this.steps.slice(0, -1));
   }
+  compact() {
+    const out = [];
+    for (const step of this.steps) {
+      const s = step.toAbstractPathStep();
+      if (s !== null)
+        out.push(s);
+    }
+    return new Path(out);
+  }
   lookup(v, dval = null) {
     let curVal = v;
     for (const step of this.steps) {
@@ -3928,7 +3940,7 @@ class Path {
         if (eid !== undefined)
           eventIds.push(eid);
         if (cid !== undefined) {
-          const comp = comps.getComponentForId(+cid, vid);
+          const comp = comps.getComponentForId(+cid);
           if (isLeafComponent) {
             handlers = findHandlers(comp, eventIds, vid, eventName);
             if (handlers === null && stopOnNoEvent)
@@ -4033,13 +4045,13 @@ class PathBuilder {
     return this.add(new FieldStep(name));
   }
   index(name, index) {
-    return this.add(new SeqIndexStep(name, index));
+    return this.add(new SeqStep(name, index));
   }
   key(name, key) {
-    return this.add(new SeqKeyStep(name, key));
+    return this.add(new SeqStep(name, key));
   }
 }
-var NONE, BindStep, FieldStep, FieldSeqStep, SeqKeyStep, SeqIndexStep, SeqAccessStep, EachBindStep, EachRenderItStep, EMPTY_META, NO_EVENT_INFO;
+var NONE, BindStep, FieldStep, SeqStep, SeqAccessStep, EachBindStep, EachRenderItStep, EMPTY_META, NO_EVENT_INFO;
 var init_path = __esm(() => {
   NONE = Symbol("NONE");
   BindStep = class BindStep extends Step {
@@ -4062,6 +4074,9 @@ var init_path = __esm(() => {
     withKey(key) {
       return new BindStep({ ...this.binds, key });
     }
+    toAbstractPathStep() {
+      return null;
+    }
   };
   FieldStep = class FieldStep extends Step {
     constructor(field) {
@@ -4075,13 +4090,13 @@ var init_path = __esm(() => {
       return root.set(this.field, v);
     }
     withIndex(i) {
-      return new SeqIndexStep(this.field, i);
+      return new SeqStep(this.field, i);
     }
     withKey(k) {
-      return new SeqKeyStep(this.field, k);
+      return new SeqStep(this.field, k);
     }
   };
-  FieldSeqStep = class FieldSeqStep extends Step {
+  SeqStep = class SeqStep extends Step {
     constructor(field, key) {
       super();
       this.field = field;
@@ -4092,16 +4107,13 @@ var init_path = __esm(() => {
       return o?.get ? o.get(this.key, dval) : dval;
     }
     setValue(root, v) {
-      return root.set(this.field, root.get(this.field).set(this.key, v));
+      const seq = root?.get(this.field, null);
+      return seq ? root.set(this.field, seq.set(this.key, v)) : root;
     }
     enterFrame(stack, _prev, next) {
       return stack.enter(next, { key: this.key }, true);
     }
   };
-  SeqKeyStep = class SeqKeyStep extends FieldSeqStep {
-  };
-  SeqIndexStep = class SeqIndexStep extends FieldSeqStep {
-  };
   SeqAccessStep = class SeqAccessStep extends Step {
     constructor(seqField, keyField) {
       super();
@@ -4135,24 +4147,17 @@ var init_path = __esm(() => {
       const item = this.seqVal.eval(stack)?.get(this.key, null);
       return stack.enter(next, { key: this.key, value: item }, false);
     }
-  };
-  EachRenderItStep = class EachRenderItStep extends Step {
-    constructor(seqField, key) {
-      super();
-      this.seqField = seqField;
-      this.key = key;
-    }
-    lookup(v, dval = null) {
-      const seq = v?.get(this.seqField, null);
-      return seq?.get ? seq.get(this.key, dval) : dval;
-    }
-    setValue(root, v) {
-      const seq = root?.get(this.seqField, null);
-      return seq ? root.set(this.seqField, seq.set(this.key, v)) : root;
+    toAbstractPathStep() {
+      return null;
     }
+  };
+  EachRenderItStep = class EachRenderItStep extends SeqStep {
     enterFrame(stack, _prev, next) {
       return stack.enter(next, { key: this.key, value: next }, false).enter(next, {}, true);
     }
+    toAbstractPathStep() {
+      return new SeqStep(this.field, this.key);
+    }
   };
   EMPTY_META = {};
   NO_EVENT_INFO = [null, null];
@@ -4473,7 +4478,7 @@ var init_value = __esm(() => {
     }
     eval(stack) {
       const key = this.keyVal.eval(stack);
-      return this.seqVal.eval(stack).get(key, null);
+      return this.seqVal.eval(stack)?.get(key, null);
     }
     toString() {
       return `${this.seqVal}[${this.keyVal}]`;
@@ -8519,9 +8524,9 @@ class Transactor {
   pushSend(path, name, args = [], opts = {}, parent = null) {
     this.pushTransaction(new SendEvent(path, this, name, args, parent, opts));
   }
-  pushBubble(path, name, args = [], opts = {}, parent = null) {
+  pushBubble(path, name, args = [], opts = {}, parent = null, targetPath = null) {
     const newOpts = opts.skipSelf ? { ...opts, skipSelf: false } : opts;
-    this.pushTransaction(new BubbleEvent(path, this, name, args, parent, newOpts));
+    this.pushTransaction(new BubbleEvent(path, this, name, args, parent, newOpts, targetPath));
   }
   async pushRequest(path, name, args = [], opts = {}, parent = null) {
     const curRoot = this.state.val;
@@ -8620,8 +8625,7 @@ function getValue(e) {
 }
 
 class Task {
-  constructor(info) {
-    this.info = info;
+  constructor() {
     this.deps = [];
     this.val = this.resolve = this.reject = null;
     this.promise = new Promise((res, rej) => {
@@ -8693,14 +8697,15 @@ var init_transactor = __esm(() => {
     getHandlerAndArgs(root, _instance, comps) {
       const stack = this.buildStack(root, comps);
       const [handler, args] = this.handler.getHandlerAndArgs(stack, this);
+      const path = this.path.compact();
       let dispatcher;
       for (let i = 0;i < args.length; i++) {
         if (args[i]?.toHandlerArg) {
-          dispatcher ??= new Dispatcher(this.path, this.transactor, this);
+          dispatcher ??= new Dispatcher(path, this.transactor, this);
           args[i] = args[i].toHandlerArg(dispatcher);
         }
       }
-      args.push(new EventContext(this.path, this.transactor, this));
+      args.push(new EventContext(path, this.transactor, this));
       return [handler, args];
     }
     lookupName(name) {
@@ -8751,6 +8756,7 @@ var init_transactor = __esm(() => {
       this.name = name;
       this.args = args;
       this.opts = opts;
+      this.targetPath = path;
     }
     handlerProp = null;
     getHandlerForName(comp) {
@@ -8771,13 +8777,17 @@ var init_transactor = __esm(() => {
       return this.opts.skipSelf ? rootVal : this.updateRootValue(rootVal, comps);
     }
     afterTransaction() {
-      const { path, name, args, opts } = this;
+      const { path, name, args, opts, targetPath } = this;
       if (opts.bubbles && path.steps.length > 0)
-        this.transactor.pushBubble(path.popStep(), name, args, opts, this);
+        this.transactor.pushBubble(path.popStep(), name, args, opts, this, targetPath);
     }
   };
   BubbleEvent = class BubbleEvent extends SendEvent {
     handlerProp = "bubble";
+    constructor(path, transactor, name, args, parent, opts, targetPath) {
+      super(path, transactor, name, args, parent, opts);
+      this.targetPath = targetPath ?? path;
+    }
     stopPropagation() {
       this.opts.bubbles = false;
     }
@@ -8786,6 +8796,9 @@ var init_transactor = __esm(() => {
     get name() {
       return this.parent?.name ?? null;
     }
+    get targetPath() {
+      return this.parent.targetPath;
+    }
     stopPropagation() {
       return this.parent.stopPropagation();
     }
@@ -9199,7 +9212,7 @@ class App {
       if (!_touch.active) {
         const dx = clientX - _touch.startX;
         const dy = clientY - _touch.startY;
-        if (dx * dx + dy * dy < TOUCH_DRAG_THRESHOLD_SQ)
+        if (dx * dx + dy * dy < 100)
           return;
         _touch.active = true;
         e.preventDefault();
@@ -9376,7 +9389,7 @@ class DragInfo {
     return this.stack.lookupBind(name);
   }
 }
-var _evs, TOUCH_DRAG_THRESHOLD_PX = 10, TOUCH_DRAG_THRESHOLD_SQ, NOOP = () => {}, listenerOpts = (name) => name === "touchmove" ? { passive: false } : undefined;
+var _evs, NOOP = () => {}, listenerOpts = (name) => name === "touchmove" ? { passive: false } : undefined;
 var init_app = __esm(() => {
   init_components();
   init_path();
@@ -9384,7 +9397,6 @@ var init_app = __esm(() => {
   init_transactor();
   init_vdom();
   _evs = "dragstart dragover dragend touchstart touchmove touchend touchcancel".split(" ");
-  TOUCH_DRAG_THRESHOLD_SQ = TOUCH_DRAG_THRESHOLD_PX * TOUCH_DRAG_THRESHOLD_PX;
 });
 
 // deps/immutable.js
@@ -13709,7 +13721,7 @@ class Renderer {
   }
   renderRoot(stack, val, viewName = null) {
     const comp = this.comps.getCompFor(val);
-    const nid = comp.getView(viewName).anode.nodeId ?? null;
+    const nid = comp?.getView(viewName).anode.nodeId ?? null;
     return comp ? this._rValComp(stack, val, comp, nid, "ROOT", viewName) : null;
   }
   renderIt(stack, nodeId, key, viewName) {
@@ -13717,7 +13729,7 @@ class Renderer {
     return comp ? this._rValComp(stack, stack.it, comp, nodeId, key, viewName) : null;
   }
   _rValComp(stack, val, comp, nid, key, viewName) {
-    const cacheKey = `${viewName ?? stack.viewsId ?? ""}${nid}-${key}`;
+    const cacheKey = `${viewName ?? stack.viewsId ?? ""}-${nid}-${key}`;
     const cachePath = [val];
     stack._pushDynBindValuesToArray(cachePath, comp.dynamic);
     const cachedNode = this.cache.get(cachePath, cacheKey);

package/dist/tutuca-dev.js

@@ -3306,6 +3306,9 @@ class Step {
   enterFrame(stack, _prev, next) {
     return stack.enter(next, {}, true);
   }
+  toAbstractPathStep() {
+    return this;
+  }
 }
 
 class BindStep extends Step {
@@ -3328,6 +3331,9 @@ class BindStep extends Step {
   withKey(key) {
     return new BindStep({ ...this.binds, key });
   }
+  toAbstractPathStep() {
+    return null;
+  }
 }
 
 class FieldStep extends Step {
@@ -3342,14 +3348,14 @@ class FieldStep extends Step {
     return root.set(this.field, v);
   }
   withIndex(i) {
-    return new SeqIndexStep(this.field, i);
+    return new SeqStep(this.field, i);
   }
   withKey(k) {
-    return new SeqKeyStep(this.field, k);
+    return new SeqStep(this.field, k);
   }
 }
 
-class FieldSeqStep extends Step {
+class SeqStep extends Step {
   constructor(field, key) {
     super();
     this.field = field;
@@ -3360,19 +3366,14 @@ class FieldSeqStep extends Step {
     return o?.get ? o.get(this.key, dval) : dval;
   }
   setValue(root, v) {
-    return root.set(this.field, root.get(this.field).set(this.key, v));
+    const seq = root?.get(this.field, null);
+    return seq ? root.set(this.field, seq.set(this.key, v)) : root;
   }
   enterFrame(stack, _prev, next) {
     return stack.enter(next, { key: this.key }, true);
   }
 }
 
-class SeqKeyStep extends FieldSeqStep {
-}
-
-class SeqIndexStep extends FieldSeqStep {
-}
-
 class SeqAccessStep extends Step {
   constructor(seqField, keyField) {
     super();
@@ -3407,25 +3408,18 @@ class EachBindStep extends Step {
     const item = this.seqVal.eval(stack)?.get(this.key, null);
     return stack.enter(next, { key: this.key, value: item }, false);
   }
+  toAbstractPathStep() {
+    return null;
+  }
 }
 
-class EachRenderItStep extends Step {
-  constructor(seqField, key) {
-    super();
-    this.seqField = seqField;
-    this.key = key;
-  }
-  lookup(v, dval = null) {
-    const seq = v?.get(this.seqField, null);
-    return seq?.get ? seq.get(this.key, dval) : dval;
-  }
-  setValue(root, v) {
-    const seq = root?.get(this.seqField, null);
-    return seq ? root.set(this.seqField, seq.set(this.key, v)) : root;
-  }
+class EachRenderItStep extends SeqStep {
   enterFrame(stack, _prev, next) {
     return stack.enter(next, { key: this.key, value: next }, false).enter(next, {}, true);
   }
+  toAbstractPathStep() {
+    return new SeqStep(this.field, this.key);
+  }
 }
 
 class Path {
@@ -3438,6 +3432,15 @@ class Path {
   popStep() {
     return new Path(this.steps.slice(0, -1));
   }
+  compact() {
+    const out = [];
+    for (const step of this.steps) {
+      const s = step.toAbstractPathStep();
+      if (s !== null)
+        out.push(s);
+    }
+    return new Path(out);
+  }
   lookup(v, dval = null) {
     let curVal = v;
     for (const step of this.steps) {
@@ -3490,7 +3493,7 @@ class Path {
         if (eid !== undefined)
           eventIds.push(eid);
         if (cid !== undefined) {
-          const comp = comps.getComponentForId(+cid, vid);
+          const comp = comps.getComponentForId(+cid);
           if (isLeafComponent) {
             handlers = findHandlers(comp, eventIds, vid, eventName);
             if (handlers === null && stopOnNoEvent)
@@ -3597,10 +3600,10 @@ class PathBuilder {
     return this.add(new FieldStep(name));
   }
   index(name, index) {
-    return this.add(new SeqIndexStep(name, index));
+    return this.add(new SeqStep(name, index));
   }
   key(name, key) {
-    return this.add(new SeqKeyStep(name, key));
+    return this.add(new SeqStep(name, key));
   }
 }
 
@@ -3917,7 +3920,7 @@ class SeqAccessVal extends RenderVal {
   }
   eval(stack) {
     const key = this.keyVal.eval(stack);
-    return this.seqVal.eval(stack).get(key, null);
+    return this.seqVal.eval(stack)?.get(key, null);
   }
   toString() {
     return `${this.seqVal}[${this.keyVal}]`;
@@ -8645,6 +8648,8 @@ class Component {
         this.extra[key] = o[key];
   }
   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)) {
@@ -8657,8 +8662,6 @@ class Component {
           this.dynamic[key] = new DynamicAlias(key, val, compName, dynName);
       }
     }
-    for (const name in this.views)
-      this.views[name].compile(new ParseContext2, this.scope, this.id);
   }
   make(args, opts) {
     return this.Class.make(args, opts);
@@ -8857,9 +8860,9 @@ class Transactor {
   pushSend(path, name, args = [], opts = {}, parent = null) {
     this.pushTransaction(new SendEvent(path, this, name, args, parent, opts));
   }
-  pushBubble(path, name, args = [], opts = {}, parent = null) {
+  pushBubble(path, name, args = [], opts = {}, parent = null, targetPath = null) {
     const newOpts = opts.skipSelf ? { ...opts, skipSelf: false } : opts;
-    this.pushTransaction(new BubbleEvent(path, this, name, args, parent, newOpts));
+    this.pushTransaction(new BubbleEvent(path, this, name, args, parent, newOpts, targetPath));
   }
   async pushRequest(path, name, args = [], opts = {}, parent = null) {
     const curRoot = this.state.val;
@@ -8972,14 +8975,15 @@ class InputEvent extends Transaction {
   getHandlerAndArgs(root, _instance, comps) {
     const stack = this.buildStack(root, comps);
     const [handler, args] = this.handler.getHandlerAndArgs(stack, this);
+    const path = this.path.compact();
     let dispatcher;
     for (let i = 0;i < args.length; i++) {
       if (args[i]?.toHandlerArg) {
-        dispatcher ??= new Dispatcher(this.path, this.transactor, this);
+        dispatcher ??= new Dispatcher(path, this.transactor, this);
         args[i] = args[i].toHandlerArg(dispatcher);
       }
     }
-    args.push(new EventContext(this.path, this.transactor, this));
+    args.push(new EventContext(path, this.transactor, this));
     return [handler, args];
   }
   lookupName(name) {
@@ -9031,6 +9035,7 @@ class NameArgsTransaction extends Transaction {
     this.name = name;
     this.args = args;
     this.opts = opts;
+    this.targetPath = path;
   }
   handlerProp = null;
   getHandlerForName(comp) {
@@ -9053,22 +9058,25 @@ class SendEvent extends NameArgsTransaction {
     return this.opts.skipSelf ? rootVal : this.updateRootValue(rootVal, comps);
   }
   afterTransaction() {
-    const { path, name, args, opts } = this;
+    const { path, name, args, opts, targetPath } = this;
     if (opts.bubbles && path.steps.length > 0)
-      this.transactor.pushBubble(path.popStep(), name, args, opts, this);
+      this.transactor.pushBubble(path.popStep(), name, args, opts, this, targetPath);
   }
 }
 
 class BubbleEvent extends SendEvent {
   handlerProp = "bubble";
+  constructor(path, transactor, name, args, parent, opts, targetPath) {
+    super(path, transactor, name, args, parent, opts);
+    this.targetPath = targetPath ?? path;
+  }
   stopPropagation() {
     this.opts.bubbles = false;
   }
 }
 
 class Task {
-  constructor(info) {
-    this.info = info;
+  constructor() {
     this.deps = [];
     this.val = this.resolve = this.reject = null;
     this.promise = new Promise((res, rej) => {
@@ -9127,6 +9135,9 @@ class EventContext extends Dispatcher {
   get name() {
     return this.parent?.name ?? null;
   }
+  get targetPath() {
+    return this.parent.targetPath;
+  }
   stopPropagation() {
     return this.parent.stopPropagation();
   }
@@ -9546,7 +9557,7 @@ class App {
       if (!_touch.active) {
         const dx = clientX - _touch.startX;
         const dy = clientY - _touch.startY;
-        if (dx * dx + dy * dy < TOUCH_DRAG_THRESHOLD_SQ)
+        if (dx * dx + dy * dy < 100)
           return;
         _touch.active = true;
         e.preventDefault();
@@ -9677,8 +9688,6 @@ function injectCss(nodeId, style, styleTarget = document.head) {
   styleNode.innerHTML = style;
   styleTarget.appendChild(styleNode);
 }
-var TOUCH_DRAG_THRESHOLD_PX = 10;
-var TOUCH_DRAG_THRESHOLD_SQ = TOUCH_DRAG_THRESHOLD_PX * TOUCH_DRAG_THRESHOLD_PX;
 var NOOP = () => {};
 function findTouch(e, id) {
   for (const t of e.changedTouches)
@@ -14427,11 +14436,10 @@ class ClassBuilder {
           const field = fields[key];
           if (compFields.has(key))
             args[key] = mkCompField(field, opts.scope, inArgs[key]);
-          else if (field === undefined) {
+          else if (field === undefined)
             console.warn("extra argument to constructor:", name, key, inArgs);
-            continue;
-          }
-          args[key] = field.coerceOrDefault(inArgs[key]);
+          else
+            args[key] = field.coerceOrDefault(inArgs[key]);
         }
         for (const key of compFields)
           if (args[key] === undefined)
@@ -14456,15 +14464,12 @@ class ClassBuilder {
     return Class;
   }
   methods(proto) {
-    return this._mergeProto(this._methods, proto, "method");
+    for (const k in proto)
+      this._methods[k] = proto[k];
   }
   statics(proto) {
-    return this._mergeProto(this._statics, proto, "static");
-  }
-  _mergeProto(target, proto, _name) {
     for (const k in proto)
-      target[k] = proto[k];
-    return this;
+      this._statics[k] = proto[k];
   }
   addField(name, dval, FieldCls) {
     const field = new FieldCls(name, dval);
@@ -14635,7 +14640,7 @@ class Renderer {
   }
   renderRoot(stack, val, viewName = null) {
     const comp = this.comps.getCompFor(val);
-    const nid = comp.getView(viewName).anode.nodeId ?? null;
+    const nid = comp?.getView(viewName).anode.nodeId ?? null;
     return comp ? this._rValComp(stack, val, comp, nid, "ROOT", viewName) : null;
   }
   renderIt(stack, nodeId, key, viewName) {
@@ -14643,7 +14648,7 @@ class Renderer {
     return comp ? this._rValComp(stack, stack.it, comp, nodeId, key, viewName) : null;
   }
   _rValComp(stack, val, comp, nid, key, viewName) {
-    const cacheKey = `${viewName ?? stack.viewsId ?? ""}${nid}-${key}`;
+    const cacheKey = `${viewName ?? stack.viewsId ?? ""}-${nid}-${key}`;
     const cachePath = [val];
     stack._pushDynBindValuesToArray(cachePath, comp.dynamic);
     const cachedNode = this.cache.get(cachePath, cacheKey);