bobe 0.0.42 → 0.0.43

package/dist/index.d.ts

@@ -49,6 +49,7 @@ declare class Interpreter {
     oneRealPropParsed: Interpreter['onePropParsed'];
     componentOrFragmentDeclaration(ComponentOrRender: BobeUI | typeof Store, ctx: ProgramCtx): ComponentNode$1;
     getFn(data: any, expression: string | number): any;
+    getAssignFn(data: any, expression: string | number): any;
     condDeclaration(ctx: ProgramCtx): IfNode;
     removeLogicNode(node: LogicNode): void;
     /**
@@ -89,7 +90,7 @@ declare class Interpreter {
     defaultInsert(parent: any, node: any, prev: any): void;
     remove(node: any, parent?: any, prev?: any): void;
     defaultRemove(node: any, parent: any, prevSibling: any): void;
-    setProp(node: any, key: string, value: any, hookI?: number): void;
+    setProp(node: any, key: string, value: any, hookI?: number): void | undefined | (() => void);
 }
 
 interface StackNode<T> {

package/dist/index.umd.js

@@ -1910,16 +1910,20 @@
     }
     onePropParsed(data, node, key, value, valueIsMapKey, isFn, hookI) {
       if (isFn) {
-        this.setProp(node, key, value, hookI);
+        new aoye.Scope(() => {
+          return this.setProp(node, key, value, hookI);
+        }).get();
       } else if (typeof value === 'function') {
         new aoye.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 aoye.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);
@@ -1944,7 +1948,7 @@
         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) {
@@ -1955,7 +1959,7 @@
           const meta = child[aoye.Keys.Meta];
           const cells = meta.cells;
           if (typeof value === 'function') {
-            const computed = new aoye.Computed(value);
+            const computed = new aoye.Computed(() => value(data));
             cells.set(key, computed);
             child[aoye.Keys.Raw][key] = undefined;
           } else {
@@ -1972,6 +1976,10 @@
     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_${bobeShared.date32()}`;
+      return new Function('data', valueId, `with(data){${expression}=${valueId}};`).bind(undefined, data);
+    }
     condDeclaration(ctx) {
       const prevSibling = ctx.prevSibling;
       const keyWord = this.tokenizer.token;
@@ -2125,7 +2133,27 @@
             hookI = _this$tokenizer$_hook4[2];
           const rawVal = data[aoye.Keys.Raw][value];
           const isFn = typeof rawVal === 'function';
-          if (hookType === 'dynamic') {
+          if (key === 'ref') {
+            const valueIsMapKey = Reflect.has(data[aoye.Keys.Raw], value);
+            let refValue = _node;
+            if (_node.__logicType === FakeType.Component) {
+              refValue = _node.data;
+            } else {
+              refValue[aoye.Keys.ProxyFreeObject] = true;
+            }
+            if (valueIsMapKey) {
+              data[value] = refValue;
+              new aoye.Scope(() => () => {
+                data[value] = null;
+              }).get();
+            } else {
+              const fn = this.getAssignFn(data, value);
+              fn(refValue);
+              new aoye.Scope(() => () => {
+                fn(null);
+              }).get();
+            }
+          } else if (hookType === 'dynamic') {
             const valueIsMapKey = Reflect.has(data[aoye.Keys.Raw], value);
             const fn = isFn ? rawVal : valueIsMapKey ? value : this.getFn(data, value);
             this.onePropParsed(data, _node, key, fn, valueIsMapKey, isFn, hookI);
@@ -2210,7 +2238,7 @@
   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 = {