tutuca 0.9.89 → 0.9.91

package/dist/tutuca-storybook.js

@@ -220,16 +220,32 @@ var Section = component({
 });
 var Example = component({
   name: "Example",
-  fields: { id: "?", title: "?", description: "", value: null, view: "main" },
+  fields: {
+    id: "?",
+    title: "?",
+    description: "",
+    value: null,
+    view: "main",
+    requestHandlers: null
+  },
+  requestOverridesField: "requestHandlers",
   statics: {
-    fromData({ id, title = "No Title Example", description = "", value = null, view = "main" }) {
+    fromData({
+      id,
+      title = "No Title Example",
+      description = "",
+      value = null,
+      view = "main",
+      requestHandlers = null
+    }) {
       id ??= slugify(title);
       return this.make({
         id,
         title,
         description,
         value,
-        view
+        view,
+        requestHandlers
       });
     }
   },
@@ -276,15 +292,23 @@ function slugify(str) {
   return String(str).normalize("NFKD").replace(/[̀-ͯ]/g, "").toLowerCase().trim().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 }
 function buildStorybook(modules) {
-  const sections = modules.flatMap((m) => {
+  const rawSections = modules.flatMap((m) => {
     const raw = m.getExamples?.();
     if (raw == null)
       return [];
     return Array.isArray(raw) ? raw : [raw];
-  }).map((s) => Section.Class.fromData(s)).sort((a, b) => a.title.localeCompare(b.title));
+  });
+  const sections = rawSections.map((s) => Section.Class.fromData(s)).sort((a, b) => a.title.localeCompare(b.title));
   const components = new Set([Storybook, Section, Example]);
   const macros = {};
   const requestHandlers = {};
+  const overrideNames = new Set;
+  for (const s of rawSections) {
+    for (const it of s?.items ?? []) {
+      for (const name in it?.requestHandlers ?? {})
+        overrideNames.add(name);
+    }
+  }
   for (const m of modules) {
     for (const c of m.getComponents?.() ?? []) {
       components.add(c);
@@ -298,8 +322,35 @@ function buildStorybook(modules) {
     root: Storybook.make({ sections }),
     components: [...components],
     macros,
-    requestHandlers
+    requestHandlers,
+    overrideNames
+  };
+}
+function buildExampleRequestHandlers({ requestHandlers: reals, overrideNames }) {
+  const names = new Set([...Object.keys(reals), ...overrideNames]);
+  const makeMeta = (name) => async (...rest) => {
+    const ctx = rest.at(-1);
+    const args = rest.slice(0, -1);
+    let override = null;
+    ctx.walkPath((Comp, inst) => {
+      const field = Comp.extra?.requestOverridesField;
+      if (!field)
+        return;
+      const map = inst.get(field, null);
+      if (map && name in map) {
+        override = map[name];
+        return false;
+      }
+    });
+    const fn = override ?? reals[name];
+    if (!fn)
+      throw new Error(`Request not found: ${name}`);
+    return await fn(...args, ctx);
   };
+  const handlers = {};
+  for (const name of names)
+    handlers[name] = makeMeta(name);
+  return handlers;
 }
 async function mountStorybook(selector, modules, { compileCss, root, persistUrl = true } = {}) {
   const app = tutuca(selector);
@@ -307,7 +358,7 @@ async function mountStorybook(selector, modules, { compileCss, root, persistUrl
   app.state.set(root ?? built.root);
   const scope = app.registerComponents(built.components);
   scope.registerMacros(built.macros);
-  scope.registerRequestHandlers(built.requestHandlers);
+  scope.registerRequestHandlers(buildExampleRequestHandlers(built));
   if (persistUrl) {
     scope.registerRequestHandlers({ persistState, loadState });
   }
@@ -351,6 +402,7 @@ export {
   getComponents,
   fuzzyMatch,
   buildStorybook,
+  buildExampleRequestHandlers,
   Storybook,
   Section,
   Example

package/dist/tutuca.ext.js

@@ -250,6 +250,17 @@ class Path {
     }
     return curVal;
   }
+  resolveChain(root) {
+    const out = [root];
+    let curVal = root;
+    for (const step of this.steps) {
+      curVal = step.lookup(curVal, NONE);
+      if (curVal === NONE)
+        break;
+      out.push(curVal);
+    }
+    return out;
+  }
   setValue(root, v) {
     const intermediates = new Array(this.steps.length);
     let curVal = root;
@@ -2926,6 +2937,7 @@ class Transactor {
     const txnPath = path.toTransactionPath();
     const curLeaf = txnPath.lookup(curRoot);
     const handler = this.comps.getRequestFor(curLeaf, name) ?? mkReq404(name);
+    const reqCtx = new RequestContext(path, this, parent, curRoot);
     const resHandlerName = opts?.onResName ?? name;
     const resPath = opts?.livePath ? null : txnPath.pinKeys(curRoot);
     const push = (specificName, baseName, singleArg, result, error) => {
@@ -2934,7 +2946,7 @@ class Transactor {
       this.pushTransaction(t);
     };
     try {
-      const result = await handler.fn.apply(null, args);
+      const result = await handler.fn.apply(null, [...args, reqCtx]);
       push(opts?.onOkName, resHandlerName, result, result, null);
     } catch (error) {
       push(opts?.onErrorName, resHandlerName, error, null, error);
@@ -3177,10 +3189,20 @@ class Task {
 }
 
 class Dispatcher {
-  constructor(path, transactor, parentTransaction) {
+  constructor(path, transactor, parentTransaction, root = transactor.state.val) {
     this.path = path;
     this.transactor = transactor;
     this.parent = parentTransaction;
+    this.root = root;
+  }
+  walkPath(callback) {
+    const comps = this.transactor.comps;
+    const chain = this.path.toTransactionPath().resolveChain(this.root);
+    for (let i = chain.length - 1;i >= 0; i--) {
+      const comp = comps.getCompFor(chain[i]);
+      if (comp && callback(comp, chain[i]) === false)
+        return;
+    }
   }
   get at() {
     return new PathChanges(this);
@@ -3217,6 +3239,9 @@ class EventContext extends Dispatcher {
   }
 }
 
+class RequestContext extends Dispatcher {
+}
+
 class PathChanges extends PathBuilder {
   constructor(dispatcher) {
     super();

package/dist/tutuca.js

@@ -4623,6 +4623,17 @@ class Path {
     }
     return curVal;
   }
+  resolveChain(root) {
+    const out = [root];
+    let curVal = root;
+    for (const step of this.steps) {
+      curVal = step.lookup(curVal, NONE);
+      if (curVal === NONE)
+        break;
+      out.push(curVal);
+    }
+    return out;
+  }
   setValue(root, v) {
     const intermediates = new Array(this.steps.length);
     let curVal = root;
@@ -7296,6 +7307,7 @@ class Transactor {
     const txnPath = path.toTransactionPath();
     const curLeaf = txnPath.lookup(curRoot);
     const handler = this.comps.getRequestFor(curLeaf, name) ?? mkReq404(name);
+    const reqCtx = new RequestContext(path, this, parent, curRoot);
     const resHandlerName = opts?.onResName ?? name;
     const resPath = opts?.livePath ? null : txnPath.pinKeys(curRoot);
     const push = (specificName, baseName, singleArg, result, error) => {
@@ -7304,7 +7316,7 @@ class Transactor {
       this.pushTransaction(t);
     };
     try {
-      const result = await handler.fn.apply(null, args);
+      const result = await handler.fn.apply(null, [...args, reqCtx]);
       push(opts?.onOkName, resHandlerName, result, result, null);
     } catch (error) {
       push(opts?.onErrorName, resHandlerName, error, null, error);
@@ -7547,10 +7559,20 @@ class Task {
 }
 
 class Dispatcher {
-  constructor(path, transactor, parentTransaction) {
+  constructor(path, transactor, parentTransaction, root = transactor.state.val) {
     this.path = path;
     this.transactor = transactor;
     this.parent = parentTransaction;
+    this.root = root;
+  }
+  walkPath(callback) {
+    const comps = this.transactor.comps;
+    const chain = this.path.toTransactionPath().resolveChain(this.root);
+    for (let i = chain.length - 1;i >= 0; i--) {
+      const comp = comps.getCompFor(chain[i]);
+      if (comp && callback(comp, chain[i]) === false)
+        return;
+    }
   }
   get at() {
     return new PathChanges(this);
@@ -7587,6 +7609,9 @@ class EventContext extends Dispatcher {
   }
 }
 
+class RequestContext extends Dispatcher {
+}
+
 class PathChanges extends PathBuilder {
   constructor(dispatcher) {
     super();