bobe 0.0.42 → 0.0.44

package/dist/bobe.esm.js

@@ -1,5 +1,5 @@
-import { Queue, isNum, matchIdStart2, matchId, escapeMap, jsVarRegexp } from 'bobe-shared';
-import { getPulling, setPulling, Keys, Computed, Effect, toRaw, runWithPulling, Scope, deepSignal, Store, shareSignal, effect } from 'aoye';
+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';
 
 let TokenType = function (TokenType) {
@@ -31,11 +31,13 @@ let FakeType = function (FakeType) {
   FakeType[FakeType["Component"] = 16] = "Component";
   FakeType[FakeType["Fragment"] = 32] = "Fragment";
   FakeType[FakeType["ForItem"] = 64] = "ForItem";
+  FakeType[FakeType["Context"] = 128] = "Context";
   return FakeType;
 }({});
 const CondBit = FakeType.If | FakeType.Fail | FakeType.Else;
 const LogicalBit = FakeType.If | FakeType.Fail | FakeType.Else | FakeType.For | FakeType.ForItem;
 FakeType.If | FakeType.Fail | FakeType.Else | FakeType.For | FakeType.ForItem | FakeType.Component | FakeType.Fragment;
+const ContextBit = FakeType.If | FakeType.Fail | FakeType.Else | FakeType.ForItem | FakeType.Context;
 const TokenizerSwitcherBit = FakeType.Component | FakeType.Fragment;
 let NodeSort = function (NodeSort) {
   NodeSort[NodeSort["Logic"] = 1] = "Logic";
@@ -43,6 +45,7 @@ let NodeSort = function (NodeSort) {
   NodeSort[NodeSort["Component"] = 4] = "Component";
   NodeSort[NodeSort["CtxProvider"] = 8] = "CtxProvider";
   NodeSort[NodeSort["TokenizerSwitcher"] = 16] = "TokenizerSwitcher";
+  NodeSort[NodeSort["Context"] = 32] = "Context";
   return NodeSort;
 }({});
 (function (TerpEvt) {
@@ -1369,6 +1372,9 @@ function macInc(arr) {
 }
 
 const KEY_INDEX = '__BOBE_KEY_INDEX';
+let _ctxStack;
+const getCtxStack = () => _ctxStack;
+const setCtxStack = stack => _ctxStack = stack;
 
 const _excluded = ["dentStack", "isFirstToken"];
 class Interpreter {
@@ -1383,6 +1389,7 @@ class Interpreter {
     this.rootComponent = componentNode;
     this.tokenizer.nextToken();
     const stack = new MultiTypeStack();
+    setCtxStack(stack);
     stack.push({
       node: root,
       prev: null
@@ -1419,7 +1426,7 @@ class Interpreter {
         stack.push({
           node: ctx.current,
           prev: ctx.prevSibling
-        }, !ctx.current.__logicType ? NodeSort.Real : (ctx.current.__logicType & LogicalBit ? NodeSort.Logic : 0) | (ctx.current.__logicType & TokenizerSwitcherBit ? NodeSort.TokenizerSwitcher : 0) | (ctx.current.__logicType === FakeType.Component ? NodeSort.Component : 0) | NodeSort.CtxProvider);
+        }, !ctx.current.__logicType ? NodeSort.Real : (ctx.current.__logicType & LogicalBit ? NodeSort.Logic : 0) | (ctx.current.__logicType & TokenizerSwitcherBit ? NodeSort.TokenizerSwitcher : 0) | (ctx.current.__logicType & ContextBit ? NodeSort.Context : 0) | (ctx.current.__logicType === FakeType.Component ? NodeSort.Component : 0) | (ctx.current.__logicType !== FakeType.Context ? NodeSort.CtxProvider : 0));
         if (ctx.current.__logicType) {
           if (isLogicNode) {
             setPulling(ctx.current.effect);
@@ -1543,6 +1550,8 @@ class Interpreter {
     let _node;
     if (value === 'if' || value === 'else' || value === 'fail') {
       return this.condDeclaration(ctx);
+    } else if (value === 'context') {
+      _node = this.createContextNode();
     } else if (value === 'for') {
       return this.forDeclaration();
     } else if (hookType) {
@@ -1570,12 +1579,29 @@ class Interpreter {
     this.tokenizer.nextToken();
     this.headerLine(_node);
     this.extensionLines(_node);
+    this.onePropParsed = this.oneRealPropParsed;
     if (_node.__logicType & TokenizerSwitcherBit) {
-      this.onePropParsed = this.oneRealPropParsed;
       this.tokenizer = _node.tokenizer;
     }
     return _node;
   }
+  createContextNode() {
+    const child = deepSignal({}, getPulling());
+    const parentContext = this.ctx.stack.peekByType(NodeSort.Context)?.node?.context;
+    if (parentContext) {
+      Object.setPrototypeOf(child, parentContext);
+    }
+    this.onePropParsed = createStoreOnePropParsed(child);
+    const node = {
+      __logicType: FakeType.Context,
+      context: child,
+      realParent: null,
+      realBefore: null,
+      realAfter: null
+    };
+    node.realAfter = this.insertAfterAnchor('context-after');
+    return node;
+  }
   forDeclaration() {
     const arrExp = this.tokenizer.jsExp().value;
     this.tokenizer.nextToken();
@@ -1855,6 +1881,7 @@ class Interpreter {
       scope.get();
     }, null);
     data = this.getItemData(forNode, i, parentData);
+    const context = this.ctx.stack.peekByType(NodeSort.Context)?.node?.data;
     forItemNode = {
       id: this.forItemId++,
       __logicType: FakeType.ForItem,
@@ -1864,7 +1891,8 @@ class Interpreter {
       forNode,
       key: forNode.getKey?.(data),
       effect: null,
-      data
+      data,
+      context
     };
     forItemNode.effect = scope;
     return forItemNode;
@@ -1908,16 +1936,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,34 +1974,19 @@ class Interpreter {
       realBefore: null,
       realAfter: null,
       data: child,
-      tokenizer: render ? render(true) : child['ui'](true)
-    };
-    this.onePropParsed = (data, _, key, value, valueIsMapKey, isFn, hookI) => {
-      if (isFn) {
-        child[Keys.Raw][key] = value;
-      } else if (valueIsMapKey) {
-        shareSignal(data, value, child, key);
-      } else {
-        const meta = child[Keys.Meta];
-        const cells = meta.cells;
-        if (typeof value === 'function') {
-          const computed = new Computed(value);
-          cells.set(key, computed);
-          child[Keys.Raw][key] = undefined;
-        } else {
-          cells.set(key, {
-            get: () => value
-          });
-          child[Keys.Raw][key] = value;
-        }
-      }
+      tokenizer: render ? render(true) : child.ui(true)
     };
+    this.onePropParsed = createStoreOnePropParsed(child);
     node.realAfter = this.insertAfterAnchor('component-after');
     return node;
   }
   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;
@@ -1982,6 +1999,7 @@ class Interpreter {
     const noCond = value === true;
     const valueIsMapKey = !noCond && Reflect.has(data[Keys.Raw], value);
     const owner = ctx.stack.peekByType(NodeSort.TokenizerSwitcher)?.node;
+    const context = ctx.stack.peekByType(NodeSort.Context)?.node?.data;
     const ifNode = {
       __logicType: isElse ? FakeType.Else : isIf ? FakeType.If : FakeType.Fail,
       snapshot: this.tokenizer.snapshot(),
@@ -1993,7 +2011,8 @@ class Interpreter {
       isFirstRender: true,
       effect: null,
       owner,
-      data
+      data,
+      context
     };
     let signal;
     switch (keyWord.value) {
@@ -2123,7 +2142,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);
@@ -2191,6 +2230,29 @@ class Interpreter {
     node.props[key] = value;
   }
 }
+function createStoreOnePropParsed(child) {
+  const onePropParsed = (data, _, key, value, valueIsMapKey, isFn, hookI) => {
+    if (isFn) {
+      child[Keys.Raw][key] = value;
+    } else if (valueIsMapKey) {
+      shareSignal(data, value, child, key);
+    } else {
+      const meta = child[Keys.Meta];
+      const cells = meta.cells;
+      if (typeof value === 'function') {
+        const computed = new Computed(() => value(data));
+        cells.set(key, computed);
+        child[Keys.Raw][key] = undefined;
+      } else {
+        cells.set(key, {
+          get: () => value
+        });
+        child[Keys.Raw][key] = value;
+      }
+    }
+  };
+  return onePropParsed;
+}
 
 function bobe(fragments, ...values) {
   const ui = function ui(isSub) {
@@ -2208,7 +2270,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 = {
@@ -2222,5 +2284,20 @@ function customRender(option) {
   };
 }
 
-export { Compiler, NodeType, ParseSyntaxError, Tokenizer, bobe, customRender };
+const context = name => {
+  const stack = getCtxStack();
+  if (!stack) {
+    throw new Error('context() api 只能在组件中使用');
+  }
+  let context = stack.peekByType(NodeSort.Context)?.node?.context;
+  if (name) {
+    context = context?.[name];
+  }
+  if (!context) {
+    console.warn(`context(${name ?? ''}) 为空`);
+  }
+  return context;
+};
+
+export { Compiler, NodeType, ParseSyntaxError, Tokenizer, bobe, context, customRender };
 //# sourceMappingURL=bobe.esm.js.map