bobe 0.0.42 → 0.0.44

package/dist/index.d.ts

@@ -29,6 +29,7 @@ declare class Interpreter {
      * <declaration> ::= <tagName=token> <headerLine> <extensionLines>
      *  */
     declaration(ctx: ProgramCtx): any;
+    createContextNode(): ContextNode;
     forDeclaration(): ForNode | ForItemNode;
     insertForItem(forNode: ForNode, i: number, parentData: any, newChildren: ForItemNode[], before: any, snapshotForUpdate: any): void;
     removeForItem(children: ForItemNode[], i: number): void;
@@ -49,6 +50,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 +91,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> {
@@ -148,7 +150,8 @@ declare enum FakeType {
     For = 8,
     Component = 16,
     Fragment = 32,
-    ForItem = 64
+    ForItem = 64,
+    Context = 128
 }
 type NodeSortBit = number;
 type BaseType = string | number | boolean | undefined | null;
@@ -249,6 +252,7 @@ type ForItemNode = LogicNode & {
     forNode: ForNode;
     effect: Scope;
     key?: any;
+    context: any;
 };
 type IfNode = LogicNode & {
     condition: SignalNode;
@@ -257,6 +261,11 @@ type IfNode = LogicNode & {
     effect: Effect;
     preCond: IfNode | null;
     owner: ComponentNode$1 | FragmentNode$1;
+    context: any;
+};
+/** data 是 map<storeKey, store> */
+type ContextNode = Omit<LogicNode, 'data'> & {
+    context: any;
 };
 type FragmentNode$1 = LogicNode & {
     tokenizer: Tokenizer;
@@ -520,5 +529,11 @@ type ParseHooks = Partial<{
 declare function bobe(fragments: TemplateStringsArray, ...values: any[]): BobeUI;
 declare function customRender(option: CustomRenderConf): <T>(Ctor: typeof Store, root: any) => (ComponentNode$1 | Store)[];
 
-export { Compiler, NodeType, ParseErrorCode, ParseSyntaxError, Tokenizer, bobe, customRender };
-export type { ASTNodeType, BaseNode, CommentNode, ComponentNode, ConditionalNode, DynamicValue, ElementNode, FragmentNode, InterpolationNode, LoopNode, ParseError, Program, Property, PropertyKeyNode, PropertyValue, SourceLocation, StaticValue, TemplateNode, TextNode };
+type IContext = {
+    <T = any>(name: string): T;
+    <T = any>(): T;
+};
+declare const context: IContext;
+
+export { Compiler, NodeType, ParseErrorCode, ParseSyntaxError, Tokenizer, bobe, context, customRender };
+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

@@ -33,11 +33,13 @@
     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";
@@ -45,6 +47,7 @@
     NodeSort[NodeSort["Component"] = 4] = "Component";
     NodeSort[NodeSort["CtxProvider"] = 8] = "CtxProvider";
     NodeSort[NodeSort["TokenizerSwitcher"] = 16] = "TokenizerSwitcher";
+    NodeSort[NodeSort["Context"] = 32] = "Context";
     return NodeSort;
   }({});
   (function (TerpEvt) {
@@ -1371,6 +1374,9 @@
   }
 
   const KEY_INDEX = '__BOBE_KEY_INDEX';
+  let _ctxStack;
+  const getCtxStack = () => _ctxStack;
+  const setCtxStack = stack => _ctxStack = stack;
 
   const _excluded = ["dentStack", "isFirstToken"];
   class Interpreter {
@@ -1385,6 +1391,7 @@
       this.rootComponent = componentNode;
       this.tokenizer.nextToken();
       const stack = new MultiTypeStack();
+      setCtxStack(stack);
       stack.push({
         node: root,
         prev: null
@@ -1421,7 +1428,7 @@
           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) {
               aoye.setPulling(ctx.current.effect);
@@ -1545,6 +1552,8 @@
       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) {
@@ -1572,12 +1581,29 @@
       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 = aoye.deepSignal({}, aoye.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();
@@ -1857,6 +1883,7 @@
         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,
@@ -1866,7 +1893,8 @@
         forNode,
         key: forNode.getKey?.(data),
         effect: null,
-        data
+        data,
+        context
       };
       forItemNode.effect = scope;
       return forItemNode;
@@ -1910,16 +1938,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,34 +1976,19 @@
         realBefore: null,
         realAfter: null,
         data: child,
-        tokenizer: render ? render(true) : child['ui'](true)
-      };
-      this.onePropParsed = (data, _, key, value, valueIsMapKey, isFn, hookI) => {
-        if (isFn) {
-          child[aoye.Keys.Raw][key] = value;
-        } else if (valueIsMapKey) {
-          aoye.shareSignal(data, value, child, key);
-        } else {
-          const meta = child[aoye.Keys.Meta];
-          const cells = meta.cells;
-          if (typeof value === 'function') {
-            const computed = new aoye.Computed(value);
-            cells.set(key, computed);
-            child[aoye.Keys.Raw][key] = undefined;
-          } else {
-            cells.set(key, {
-              get: () => value
-            });
-            child[aoye.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_${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;
@@ -1984,6 +2001,7 @@
       const noCond = value === true;
       const valueIsMapKey = !noCond && Reflect.has(data[aoye.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(),
@@ -1995,7 +2013,8 @@
         isFirstRender: true,
         effect: null,
         owner,
-        data
+        data,
+        context
       };
       let signal;
       switch (keyWord.value) {
@@ -2125,7 +2144,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);
@@ -2193,6 +2232,29 @@
       node.props[key] = value;
     }
   }
+  function createStoreOnePropParsed(child) {
+    const onePropParsed = (data, _, key, value, valueIsMapKey, isFn, hookI) => {
+      if (isFn) {
+        child[aoye.Keys.Raw][key] = value;
+      } else if (valueIsMapKey) {
+        aoye.shareSignal(data, value, child, key);
+      } else {
+        const meta = child[aoye.Keys.Meta];
+        const cells = meta.cells;
+        if (typeof value === 'function') {
+          const computed = new aoye.Computed(() => value(data));
+          cells.set(key, computed);
+          child[aoye.Keys.Raw][key] = undefined;
+        } else {
+          cells.set(key, {
+            get: () => value
+          });
+          child[aoye.Keys.Raw][key] = value;
+        }
+      }
+    };
+    return onePropParsed;
+  }
 
   function bobe(fragments, ...values) {
     const ui = function ui(isSub) {
@@ -2210,7 +2272,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 = {
@@ -2224,11 +2286,27 @@
     };
   }
 
+  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;
+  };
+
   exports.Compiler = Compiler;
   exports.NodeType = NodeType;
   exports.ParseSyntaxError = ParseSyntaxError;
   exports.Tokenizer = Tokenizer;
   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, {