bobe 0.0.47 → 0.0.48

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { Queue } from 'bobe-shared';
-import { Store, Scope, Signal, Computed, Effect, SignalNode } from 'aoye';
-export * from 'aoye';
+import * as aoye from 'aoye';
+import { Store, Effect, effect as effect$1, Scope, Signal, Computed, SignalNode, ValueDiff, CustomEffectOpt } from 'aoye';
+export { Store } from 'aoye';
 
 declare class Interpreter {
     private tokenizer;
@@ -92,6 +93,8 @@ declare class Interpreter {
     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 | undefined | (() => void);
+    Effect: typeof Effect;
+    effect: typeof effect$1;
 }
 
 interface StackNode<T> {
@@ -179,7 +182,9 @@ type HookProps = {
     /** 父节点 */
     parentNode?: any;
 };
-type TerpConf = Partial<Pick<Interpreter, 'createNode' | 'setProp' | 'insertAfter' | 'remove' | 'createAnchor' | 'firstChild' | 'nextSib'>>;
+type TerpConf = Partial<Pick<Interpreter, 'createNode' | 'setProp' | 'insertAfter' | 'remove' | 'createAnchor' | 'firstChild' | 'nextSib'>> & {
+    noopEffect?: boolean;
+};
 type CustomRenderConf = Pick<TerpConf, 'createNode' | 'setProp' | 'insertAfter' | 'remove' | 'createAnchor' | 'firstChild' | 'nextSib'>;
 type Hook = (props: HookProps) => any;
 type HookType = 'dynamic' | 'static';
@@ -273,6 +278,7 @@ type FragmentNode$1 = LogicNode & {
 type ComponentNode$1 = LogicNode & {
     tokenizer: Tokenizer;
 };
+type Dep = Signal | Computed | (() => any) | string;
 
 declare class Tokenizer {
     private hook;
@@ -356,7 +362,7 @@ declare class Tokenizer {
     private dent;
     private shorterThanBaseDentEof;
     private identifier;
-    private getStr;
+    getStr(head: string, parseEscape?: boolean): string;
     private str;
     private number;
     private eof;
@@ -535,5 +541,7 @@ type IContext = {
 };
 declare const context: IContext;
 
-export { Compiler, NodeType, ParseErrorCode, ParseSyntaxError, Tokenizer, bobe, context, customRender };
+declare const effect: (callback: (...args: ValueDiff[]) => void, depOrOpt?: Dep[] | Dep | CustomEffectOpt, opt?: CustomEffectOpt) => aoye.Effect;
+
+export { Compiler, NodeType, ParseErrorCode, ParseSyntaxError, Tokenizer, bobe, context, customRender, effect };
 export type { ASTNodeType, BaseNode, CommentNode, ComponentNode, ConditionalNode, DynamicValue, ElementNode, FragmentNode, IContext, InterpolationNode, LoopNode, ParseError, Program, Property, PropertyKeyNode, PropertyValue, SourceLocation, StaticValue, TemplateNode, TextNode };

package/dist/index.umd.js

@@ -82,6 +82,7 @@
       this.loc = loc;
     }
   }
+  const isDep = target => target && (target instanceof aoye.Signal || target instanceof aoye.Computed || typeof target === 'function' || typeof target === 'string');
 
   class Tokenizer {
     TabSize = 2;
@@ -1665,7 +1666,7 @@
         _forNode$snapshot.isFirstToken;
         const snapshotForUpdate = _objectWithoutProperties(_forNode$snapshot, _excluded);
       let isFirstRender = true;
-      forNode.effect = new aoye.Effect(() => {
+      forNode.effect = new this.Effect(() => {
         let arr = arrSignal.get();
         arr[aoye.Keys.Iterator];
         const prevCtx = aoye.getPulling();
@@ -1836,7 +1837,7 @@
             }
           }
         };
-      });
+      }, aoye.ScheduleType.Render);
       return forNode.children[0] || forNode;
     }
     insertForItem(forNode, i, parentData, newChildren, before, snapshotForUpdate) {
@@ -1942,17 +1943,17 @@
           return this.setProp(node, key, value, hookI);
         }).get();
       } else if (typeof value === 'function') {
-        new aoye.Effect(() => {
+        new this.Effect(() => {
           const res = value(data);
           const dispose = this.setProp(node, key, res, hookI);
           return dispose;
-        });
+        }, aoye.ScheduleType.Render);
       } else if (valueIsMapKey) {
-        new aoye.Effect(() => {
+        new this.Effect(() => {
           const res = data[value];
           const dispose = this.setProp(node, key, res, hookI);
           return dispose;
-        });
+        }, aoye.ScheduleType.Render);
       } else {
         this.setProp(node, key, value, hookI);
       }
@@ -2075,7 +2076,7 @@
       }
       ifNode.condition = signal;
       ifNode.realAfter = this.insertAfterAnchor(`${keyWord.value}-after`);
-      const ef = aoye.effect(({
+      const ef = this.effect(({
         val
       }) => {
         if (val) {
@@ -2096,7 +2097,9 @@
           }
         }
         ifNode.isFirstRender = false;
-      }, [signal]);
+      }, [signal], {
+        type: 'render'
+      });
       ifNode.effect = ef;
       return ifNode;
     }
@@ -2182,6 +2185,10 @@
     config(opt) {
       Object.assign(this, opt);
       this.opt = opt;
+      if (opt.noopEffect) {
+        this.effect = aoye.noopEffect;
+        this.Effect = aoye.NoopEffect;
+      }
     }
     createNode(name) {
       return {
@@ -2231,6 +2238,8 @@
     setProp(node, key, value, hookI) {
       node.props[key] = value;
     }
+    Effect = aoye.Effect;
+    effect = aoye.effect;
   }
   function createStoreOnePropParsed(child) {
     const onePropParsed = (data, _, key, value, valueIsMapKey, isFn, hookI) => {
@@ -2301,6 +2310,34 @@
     return context;
   };
 
+  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, aoye.Store.Current));
+        }
+      } else {
+        newDeps.push(dep);
+      }
+    }
+    return aoye.effect(callback, newDeps, option);
+  };
+
+  Object.defineProperty(exports, "Store", {
+    enumerable: true,
+    get: function () { return aoye.Store; }
+  });
   exports.Compiler = Compiler;
   exports.NodeType = NodeType;
   exports.ParseSyntaxError = ParseSyntaxError;
@@ -2308,12 +2345,7 @@
   exports.bobe = bobe;
   exports.context = context;
   exports.customRender = customRender;
-  Object.keys(aoye).forEach(function (k) {
-    if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: function () { return aoye[k]; }
-    });
-  });
+  exports.effect = effect;
 
 }));
 //# sourceMappingURL=index.umd.js.map