bobe 0.0.46 → 0.0.48

package/dist/bobe.compiler.esm.js

@@ -1,6 +1,6 @@
 import { Queue, isNum, matchIdStart2, matchId, escapeMap, jsVarRegexp, date32 } from 'bobe-shared';
-import { getPulling, setPulling, Keys, deepSignal, Computed, Effect, toRaw, runWithPulling, Scope, Store, effect, shareSignal } from 'aoye';
-export * from 'aoye';
+import { Signal, Computed, getPulling, setPulling, Keys, deepSignal, toRaw, ScheduleType, runWithPulling, Scope, Store, noopEffect, NoopEffect, Effect, effect as effect$1, shareSignal } from 'aoye';
+export { Store } from 'aoye';
 
 let TokenType = function (TokenType) {
   TokenType[TokenType["NewLine"] = 1] = "NewLine";
@@ -80,6 +80,7 @@ class ParseSyntaxError extends SyntaxError {
     this.loc = loc;
   }
 }
+const isDep = target => target && (target instanceof Signal || target instanceof Computed || typeof target === 'function' || typeof target === 'string');
 
 class Tokenizer {
   TabSize = 2;
@@ -1704,7 +1705,7 @@ class Interpreter {
       _forNode$snapshot.isFirstToken;
       const snapshotForUpdate = _objectWithoutProperties(_forNode$snapshot, _excluded);
     let isFirstRender = true;
-    forNode.effect = new Effect(() => {
+    forNode.effect = new this.Effect(() => {
       let arr = arrSignal.get();
       arr[Keys.Iterator];
       const prevCtx = getPulling();
@@ -1875,7 +1876,7 @@ class Interpreter {
           }
         }
       };
-    });
+    }, ScheduleType.Render);
     return forNode.children[0] || forNode;
   }
   insertForItem(forNode, i, parentData, newChildren, before, snapshotForUpdate) {
@@ -1981,17 +1982,17 @@ class Interpreter {
         return this.setProp(node, key, value, hookI);
       }).get();
     } else if (typeof value === 'function') {
-      new Effect(() => {
+      new this.Effect(() => {
         const res = value(data);
         const dispose = this.setProp(node, key, res, hookI);
         return dispose;
-      });
+      }, ScheduleType.Render);
     } else if (valueIsMapKey) {
-      new Effect(() => {
+      new this.Effect(() => {
         const res = data[value];
         const dispose = this.setProp(node, key, res, hookI);
         return dispose;
-      });
+      }, ScheduleType.Render);
     } else {
       this.setProp(node, key, value, hookI);
     }
@@ -2114,7 +2115,7 @@ class Interpreter {
     }
     ifNode.condition = signal;
     ifNode.realAfter = this.insertAfterAnchor(`${keyWord.value}-after`);
-    const ef = effect(({
+    const ef = this.effect(({
       val
     }) => {
       if (val) {
@@ -2135,7 +2136,9 @@ class Interpreter {
         }
       }
       ifNode.isFirstRender = false;
-    }, [signal]);
+    }, [signal], {
+      type: 'render'
+    });
     ifNode.effect = ef;
     return ifNode;
   }
@@ -2221,6 +2224,10 @@ class Interpreter {
   config(opt) {
     Object.assign(this, opt);
     this.opt = opt;
+    if (opt.noopEffect) {
+      this.effect = noopEffect;
+      this.Effect = NoopEffect;
+    }
   }
   createNode(name) {
     return {
@@ -2270,6 +2277,8 @@ class Interpreter {
   setProp(node, key, value, hookI) {
     node.props[key] = value;
   }
+  Effect = Effect;
+  effect = effect$1;
 }
 function createStoreOnePropParsed(child) {
   const onePropParsed = (data, _, key, value, valueIsMapKey, isFn, hookI) => {
@@ -2340,5 +2349,29 @@ const context = name => {
   return context;
 };
 
-export { Compiler, NodeType, ParseSyntaxError, Tokenizer, bobe, context, customRender };
+const depTokenizer = new Tokenizer(() => '', false);
+const effect = (callback, depOrOpt, opt) => {
+  const isArray = Array.isArray(depOrOpt);
+  const isSingleDep = isDep(depOrOpt);
+  const deps = isArray ? depOrOpt : isSingleDep ? [depOrOpt] : [];
+  const option = isArray || isSingleDep ? opt : depOrOpt;
+  const newDeps = [];
+  for (let i = 0; i < deps.length; i++) {
+    const dep = deps[i];
+    if (typeof dep === 'string') {
+      depTokenizer.code = dep.trim() + '\n';
+      let exp;
+      while (depTokenizer.i < depTokenizer.code.length) {
+        exp = depTokenizer.jsExp().value;
+        depTokenizer.nextToken();
+        newDeps.push(new Function('data', `let v;with(data){v=${exp};}return v;`).bind(undefined, Store.Current));
+      }
+    } else {
+      newDeps.push(dep);
+    }
+  }
+  return effect$1(callback, newDeps, option);
+};
+
+export { Compiler, NodeType, ParseSyntaxError, Tokenizer, bobe, context, customRender, effect };
 //# sourceMappingURL=bobe.compiler.esm.js.map