bobe 0.0.42 → 0.0.43

package/dist/bobe.esm.js

@@ -1,4 +1,4 @@
-import { Queue, isNum, matchIdStart2, matchId, escapeMap, jsVarRegexp } from 'bobe-shared';
+import { Queue, isNum, matchIdStart2, matchId, escapeMap, jsVarRegexp, date32 } from 'bobe-shared';
 import { getPulling, setPulling, Keys, Computed, Effect, toRaw, runWithPulling, Scope, deepSignal, Store, shareSignal, effect } from 'aoye';
 export * from 'aoye';
 
@@ -1908,16 +1908,20 @@ class Interpreter {
   }
   onePropParsed(data, node, key, value, valueIsMapKey, isFn, hookI) {
     if (isFn) {
-      this.setProp(node, key, value, hookI);
+      new Scope(() => {
+        return this.setProp(node, key, value, hookI);
+      }).get();
     } else if (typeof value === 'function') {
       new Effect(() => {
-        const res = value();
-        this.setProp(node, key, res, hookI);
+        const res = value(data);
+        const dispose = this.setProp(node, key, res, hookI);
+        return dispose;
       });
     } else if (valueIsMapKey) {
       new Effect(() => {
         const res = data[value];
-        this.setProp(node, key, res, hookI);
+        const dispose = this.setProp(node, key, res, hookI);
+        return dispose;
       });
     } else {
       this.setProp(node, key, value, hookI);
@@ -1942,7 +1946,7 @@ class Interpreter {
       realBefore: null,
       realAfter: null,
       data: child,
-      tokenizer: render ? render(true) : child['ui'](true)
+      tokenizer: render ? render(true) : child.ui(true)
     };
     this.onePropParsed = (data, _, key, value, valueIsMapKey, isFn, hookI) => {
       if (isFn) {
@@ -1953,7 +1957,7 @@ class Interpreter {
         const meta = child[Keys.Meta];
         const cells = meta.cells;
         if (typeof value === 'function') {
-          const computed = new Computed(value);
+          const computed = new Computed(() => value(data));
           cells.set(key, computed);
           child[Keys.Raw][key] = undefined;
         } else {
@@ -1970,6 +1974,10 @@ class Interpreter {
   getFn(data, expression) {
     return new Function('data', `let v;with(data){v=${expression}};return v;`).bind(undefined, data);
   }
+  getAssignFn(data, expression) {
+    const valueId = `value_bobe_${date32()}`;
+    return new Function('data', valueId, `with(data){${expression}=${valueId}};`).bind(undefined, data);
+  }
   condDeclaration(ctx) {
     const prevSibling = ctx.prevSibling;
     const keyWord = this.tokenizer.token;
@@ -2123,7 +2131,27 @@ class Interpreter {
           hookI = _this$tokenizer$_hook4[2];
         const rawVal = data[Keys.Raw][value];
         const isFn = typeof rawVal === 'function';
-        if (hookType === 'dynamic') {
+        if (key === 'ref') {
+          const valueIsMapKey = Reflect.has(data[Keys.Raw], value);
+          let refValue = _node;
+          if (_node.__logicType === FakeType.Component) {
+            refValue = _node.data;
+          } else {
+            refValue[Keys.ProxyFreeObject] = true;
+          }
+          if (valueIsMapKey) {
+            data[value] = refValue;
+            new Scope(() => () => {
+              data[value] = null;
+            }).get();
+          } else {
+            const fn = this.getAssignFn(data, value);
+            fn(refValue);
+            new Scope(() => () => {
+              fn(null);
+            }).get();
+          }
+        } else if (hookType === 'dynamic') {
           const valueIsMapKey = Reflect.has(data[Keys.Raw], value);
           const fn = isFn ? rawVal : valueIsMapKey ? value : this.getFn(data, value);
           this.onePropParsed(data, _node, key, fn, valueIsMapKey, isFn, hookI);
@@ -2208,7 +2236,7 @@ function bobe(fragments, ...values) {
 function customRender(option) {
   return function render(Ctor, root) {
     const store = Ctor.new();
-    const tokenizer = store['ui'](false);
+    const tokenizer = store.ui(false);
     const terp = new Interpreter(tokenizer);
     terp.config(option);
     const componentNode = {