bobe 0.0.47 → 0.0.49

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;
@@ -106,10 +107,13 @@
       this.hook = hook;
       this.useDedentAsEof = useDedentAsEof;
       if (useDedentAsEof) {
-        this.setToken(TokenType.Indent, '');
-        this.isFirstToken = true;
+        this.initIndentWhenUseDedentAsEof();
       }
     }
+    initIndentWhenUseDedentAsEof() {
+      this.setToken(TokenType.Indent, '');
+      this.isFirstToken = true;
+    }
     next() {
       this.i++;
     }
@@ -139,16 +143,23 @@
     throwUnclosed(code, message, startOffset, startLine, startCol) {
       throw new ParseSyntaxError(code, message, this.unclosedLoc(startOffset, startLine, startCol));
     }
-    resume(_snapshot) {
+    resume({
+      dentStack,
+      waitingTokens,
+      ..._snapshot
+    }) {
       this.token = undefined;
       this.needIndent = false;
       this.isFirstToken = true;
-      this.dentStack = [0];
+      this.dentStack = dentStack ? dentStack.slice() : [0];
+      if (waitingTokens) {
+        this.waitingTokens = waitingTokens.clone();
+      }
       Object.assign(this, _snapshot);
     }
-    snapshot(keys) {
+    snapshot(keys, dtI = 0) {
       const snap = {
-        i: this.i,
+        i: this.i + dtI,
         waitingTokens: this.waitingTokens.clone()
       };
       if (keys) {
@@ -161,8 +172,10 @@
       }
       return snap;
     }
-    skip() {
-      const logicDentLen = this.dentStack[this.dentStack.length - 1];
+    skip(targetDentLen) {
+      if (targetDentLen == undefined) {
+        targetDentLen = this.dentStack[this.dentStack.length - 1];
+      }
       let needIndent = false;
       let skipFragment = ``;
       this.token = undefined;
@@ -185,7 +198,7 @@
           isEmptyLine = _this$getDentValue.isEmptyLine;
         const currLen = value.length;
         if (isEmptyLine) continue;
-        if (currLen > logicDentLen) {
+        if (currLen > targetDentLen) {
           skipFragment += value;
         } else {
           for (let i = this.dentStack.length - 1; i >= 0; i--) {
@@ -198,6 +211,9 @@
               break;
             }
             this.dentStack.pop();
+            if (expLen > targetDentLen) {
+              continue;
+            }
             if (!this.token) {
               this.setToken(TokenType.Dedent, String(expLen));
             } else {
@@ -252,29 +268,31 @@
         }
         outer: while (1) {
           if (this.needIndent) {
+            this.locStart();
             this.dent();
+            this.locEnd();
           } else {
             const char = this.code[this.i];
             switch (char) {
               case '\t':
               case ' ':
                 break;
-              case '\n':
-                this.newLine();
-                this.needIndent = true;
-                break;
-              case '=':
-                this.assignment();
-                break;
-              case '|':
-                this.pipe();
-                break;
-              case ';':
-                this.setToken(TokenType.Semicolon, ';');
-                break;
               default:
-                if (false) ;
+                this.locStart();
                 switch (char) {
+                  case '\n':
+                    this.newLine();
+                    this.needIndent = true;
+                    break;
+                  case '=':
+                    this.assignment();
+                    break;
+                  case '|':
+                    this.pipe();
+                    break;
+                  case ';':
+                    this.setToken(TokenType.Semicolon, ';');
+                    break;
                   case '/':
                     this.comment();
                     break;
@@ -299,7 +317,7 @@
                     }
                     break;
                 }
-                if (false) ;
+                this.locEnd();
                 break;
             }
             this.next();
@@ -315,6 +333,10 @@
         this.handledTokens.push(this.token);
       }
     }
+    locStart() {
+    }
+    locEnd() {
+    }
     getComment() {
       let value = '/';
       let nextC = this.code[this.i + 1];
@@ -331,6 +353,7 @@
       this.getComment();
     }
     condExp() {
+      this.locStart();
       let value = '';
       this.token = null;
       let char = this.code[this.i];
@@ -345,12 +368,14 @@
       const trimmed = value.replace(/\/\/[\s\S]+/, '').trim();
       this.setToken(TokenType.Identifier, trimmed ? trimmed : true, 0);
       this.handledTokens.push(this.token);
+      this.locEnd();
       return this.token;
     }
     isEol(i) {
       return this.code[i] === '\n' || this.code[i] === '/';
     }
     jsExp() {
+      this.locStart();
       this.token = null;
       let value = '';
       let char = this.code[this.i];
@@ -364,6 +389,7 @@
       }
       this.setToken(TokenType.Identifier, value, 0);
       this.handledTokens.push(this.token);
+      this.locEnd();
       return this.token;
     }
     peekChar() {
@@ -551,7 +577,7 @@
       const prevLen = this.dentStack[this.dentStack.length - 1];
       if (currLen > prevLen) {
         this.dentStack.push(currLen);
-        this.setToken(TokenType.Indent, currLen);
+        this.setToken(TokenType.Indent, currLen, 0);
         return indentHasLen;
       }
       if (currLen < prevLen) {
@@ -566,7 +592,7 @@
           }
           this.dentStack.pop();
           if (!this.token) {
-            this.setToken(TokenType.Dedent, String(expLen));
+            this.setToken(TokenType.Dedent, String(expLen), 0);
           } else {
             this.waitingTokens.push({
               type: TokenType.Dedent,
@@ -975,7 +1001,7 @@
   let _initProto;
   class Compiler {
     static {
-      var _applyDecs$e = _slicedToArray(_applyDecs2311(this, [], [[NodeHook, 2, "parseProgram"], [[NodeHook, NodeLoc], 2, "parseComponentNode"], [[NodeHook, NodeLoc], 2, "parseElementNode"], [[NodeHook, NodeLoc], 2, "parseConditionalNode"], [[NodeHook, NodeLoc], 2, "parseLoopNode"], [NodeHook, 2, "parseProperty"], [[NodeHook, TokenLoc], 2, "parsePropertyKey"], [[NodeHook, TokenLoc], 2, "parseJsExp"], [[NodeHook, TokenLoc], 2, "parsePropertyValue"], [[NodeHook, TokenLoc], 2, "parseName"]]).e, 1);
+      var _applyDecs$e = _slicedToArray(_applyDecs2311(this, [], [[NodeHook, 2, "parseProgram"], [[NodeHook, NodeLoc], 2, "parseComponentNode"], [[NodeHook, NodeLoc], 2, "parseElementNode"], [[NodeHook, NodeLoc], 2, "parseConditionalNode"], [[NodeHook, NodeLoc], 2, "parseLoopNode"], [NodeHook, 2, "parseProperty"], [[NodeHook, TokenLoc], 2, "parsePropertyKey"], [[NodeHook, TokenLoc], 2, "parseJsExp"], [[NodeHook, TokenLoc], 2, "parsePropertyValue"], [[NodeHook, NodeLoc], 2, "parsePropertyInlineFragment"], [[NodeHook, TokenLoc], 2, "parseName"]]).e, 1);
       _initProto = _applyDecs$e[0];
     }
     errors = (_initProto(this), []);
@@ -1077,9 +1103,9 @@
     parseComponentNode(node) {
       const name = this.parseName();
       this.tokenizer.nextToken();
-      const props = this.headerLineAndExtensions();
       node.type = NodeType.Component;
       node.componentName = name;
+      const props = this.headerLineAndExtensions();
       node.props = props;
       this.hooks.parseComponentNode?.propsAdded?.call(this, node);
       const children = this.handleChildren();
@@ -1097,9 +1123,9 @@
       }
       const tagName = tagToken.value;
       this.tokenizer.nextToken();
-      const props = this.headerLineAndExtensions();
       node.type = NodeType.Element;
       node.tagName = tagName;
+      const props = this.headerLineAndExtensions();
       node.props = props;
       this.hooks.parseElementNode?.propsAdded?.call(this, node);
       const children = this.handleChildren();
@@ -1173,17 +1199,17 @@
     }
     headerLineAndExtensions() {
       const props = [];
-      props.push(...this.attributeList());
-      if (this.tokenizer.token.type & TokenType.NewLine) {
-        this.tokenizer.nextToken();
-      }
-      while (this.tokenizer.token.type & TokenType.Pipe) {
-        this.tokenizer.nextToken();
+      do {
         props.push(...this.attributeList());
         if (this.tokenizer.token.type & TokenType.NewLine) {
           this.tokenizer.nextToken();
         }
-      }
+        if ((this.tokenizer.token.type & TokenType.Pipe) === 0) {
+          break;
+        } else {
+          this.tokenizer.nextToken();
+        }
+      } while (true);
       return props;
     }
     attributeList() {
@@ -1207,25 +1233,35 @@
       const token = this.tokenizer.nextToken();
       if (token.value !== '=') {
         this.addError(ParseErrorCode.MISSING_ASSIGN, `属性 "${node.key.key}" 缺少 "=" 赋值符号`, node.key.loc ?? this.tokenizer.emptyLoc(), node);
-        node.loc.start = node.key.loc.start;
-        node.loc.end = node.key.loc.end;
-        node.loc.source = this.tokenizer.code.slice(node.loc.start.offset, node.loc.end.offset);
+        this.handleOnlyKeyLoc(node);
         return node;
       }
       const valueToken = this.tokenizer.nextToken();
+      if (valueToken.type & TokenType.NewLine) {
+        this.tokenizer.nextToken();
+        node.value = this.parsePropertyInlineFragment();
+        this.handleKeyValueLoc(node);
+        return node;
+      }
       if ((valueToken.type & ValueTokenType) === 0) {
         this.addError(ParseErrorCode.MISSING_PROP_ASSIGNMENT, `属性值不合法, "${valueToken.value}" 不合法`, valueToken.loc ?? this.tokenizer.emptyLoc(), node);
-        node.loc.start = node.key.loc.start;
-        node.loc.end = node.key.loc.end;
-        node.loc.source = this.tokenizer.code.slice(node.loc.start.offset, node.loc.end.offset);
+        this.handleOnlyKeyLoc(node);
         return node;
       }
       node.value = this.parsePropertyValue();
       this.tokenizer.nextToken();
+      this.handleKeyValueLoc(node);
+      return node;
+    }
+    handleOnlyKeyLoc(node) {
+      node.loc.start = node.key.loc.start;
+      node.loc.end = node.key.loc.end;
+      node.loc.source = this.tokenizer.code.slice(node.loc.start.offset, node.loc.end.offset);
+    }
+    handleKeyValueLoc(node) {
       node.loc.start = node.key.loc.start;
       node.loc.end = node.value.loc.end;
       node.loc.source = this.tokenizer.code.slice(node.loc.start.offset, node.loc.end.offset);
-      return node;
     }
     parsePropertyKey(node) {
       node.type = NodeType.PropertyKey;
@@ -1250,6 +1286,12 @@
       node.value = value;
       return node;
     }
+    parsePropertyInlineFragment(node) {
+      const list = this.handleChildren();
+      node.type = NodeType.StaticValue;
+      node.value = list;
+      return node;
+    }
     parseName(node) {
       const _this$tokenizer$_hook7 = this.tokenizer._hook({}),
         _this$tokenizer$_hook8 = _slicedToArray(_this$tokenizer$_hook7, 2),
@@ -1473,6 +1515,9 @@
             }
             if (sort & NodeSort.TokenizerSwitcher) {
               const switcher = stack.peekByType(NodeSort.TokenizerSwitcher)?.node;
+              if (parent.resumeSnapshot) {
+                this.tokenizer.resume(parent.resumeSnapshot);
+              }
               this.tokenizer = switcher.tokenizer;
             }
             if (parent.__logicType === FakeType.ForItem) {
@@ -1567,7 +1612,7 @@
         } else {
           const valueIsMapKey = Reflect.has(data[aoye.Keys.Raw], value);
           const val = data[aoye.Keys.Raw][value];
-          if (typeof val === 'function') {
+          if (typeof val === 'function' || val instanceof InlineFragment) {
             _node = this.componentOrFragmentDeclaration(val, ctx);
           } else {
             const str = valueIsMapKey ? value : this.getFn(data, value);
@@ -1579,11 +1624,15 @@
         _node = this.createNode(value);
       }
       this.tokenizer.nextToken();
-      this.headerLine(_node);
-      this.extensionLines(_node);
+      this.headerLineAndExtensions(_node);
       this.onePropParsed = this.oneRealPropParsed;
       if (_node.__logicType & TokenizerSwitcherBit) {
         this.tokenizer = _node.tokenizer;
+        if (_node.fragmentSnapshot) {
+          this.tokenizer.resume(_node.fragmentSnapshot);
+          this.tokenizer.useDedentAsEof = true;
+          this.tokenizer.initIndentWhenUseDedentAsEof();
+        }
       }
       return _node;
     }
@@ -1665,7 +1714,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 +1885,7 @@
             }
           }
         };
-      });
+      }, aoye.ScheduleType.Render);
       return forNode.children[0] || forNode;
     }
     insertForItem(forNode, i, parentData, newChildren, before, snapshotForUpdate) {
@@ -1942,33 +1991,42 @@
           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);
       }
     }
     oneRealPropParsed = this.onePropParsed.bind(this);
     componentOrFragmentDeclaration(ComponentOrRender, ctx) {
-      let Component, render, child;
+      let Component, tokenizer, child, fragmentSnapshot, resumeSnapshot;
       const isCC = ComponentOrRender.prototype instanceof aoye.Store;
       if (isCC) {
         Component = ComponentOrRender;
         child = Component.new();
+        tokenizer = child.ui(true);
+      } else if (ComponentOrRender instanceof InlineFragment) {
+        const conf = ComponentOrRender;
+        child = aoye.deepSignal({}, aoye.getPulling(), true);
+        Object.setPrototypeOf(child, conf.data);
+        tokenizer = conf.tokenizer;
+        fragmentSnapshot = conf.snapshot;
+        resumeSnapshot = tokenizer.snapshot(['token', 'needIndent', 'isFirstToken', 'dentStack', 'isFirstToken', 'useDedentAsEof']);
       } else {
-        render = ComponentOrRender;
+        const render = ComponentOrRender;
         const boundStore = render.boundStore;
         child = aoye.deepSignal({}, aoye.getPulling(), true);
         Object.setPrototypeOf(child, boundStore);
+        tokenizer = render(true);
       }
       const node = {
         __logicType: isCC ? FakeType.Component : FakeType.Fragment,
@@ -1976,7 +2034,9 @@
         realBefore: null,
         realAfter: null,
         data: child,
-        tokenizer: render ? render(true) : child.ui(true)
+        tokenizer,
+        fragmentSnapshot,
+        resumeSnapshot
       };
       this.onePropParsed = createStoreOnePropParsed(child);
       node.realAfter = this.insertAfterAnchor('component-after');
@@ -2075,7 +2135,7 @@
       }
       ifNode.condition = signal;
       ifNode.realAfter = this.insertAfterAnchor(`${keyWord.value}-after`);
-      const ef = aoye.effect(({
+      const ef = this.effect(({
         val
       }) => {
         if (val) {
@@ -2096,7 +2156,9 @@
           }
         }
         ifNode.isFirstRender = false;
-      }, [signal]);
+      }, [signal], {
+        type: 'render'
+      });
       ifNode.effect = ef;
       return ifNode;
     }
@@ -2111,26 +2173,38 @@
         point = next;
       }
     }
-    extensionLines(_node) {
-      while (1) {
-        if ((this.tokenizer.token.type & TokenType.Pipe) === 0) {
-          return;
+    headerLineAndExtensions(_node) {
+      const tokenizer = this.tokenizer;
+      do {
+        const isComponent = _node.__logicType & TokenizerSwitcherBit;
+        let snapshot, dentLen;
+        const data = this.getData();
+        const unHandledKey = this.attributeList(_node, data);
+        if (isComponent) {
+          snapshot = tokenizer.snapshot(undefined, -1);
+          dentLen = tokenizer.dentStack[tokenizer.dentStack.length - 1];
         }
-        this.tokenizer.nextToken();
-        this.attributeList(_node);
-        if ((this.tokenizer.token.type & TokenType.NewLine) === 0) {
-          return;
+        tokenizer.nextToken();
+        if ((tokenizer.token.type & TokenType.Pipe) === 0) {
+          if (isComponent && tokenizer.token.type & TokenType.Indent) {
+            this.inlineFragment(_node, snapshot, data, unHandledKey);
+            tokenizer.skip(dentLen);
+            if ((tokenizer.token.type & TokenType.Pipe) === 0) {
+              break;
+            }
+          } else {
+            break;
+          }
         }
-        this.tokenizer.nextToken();
-      }
+        tokenizer.nextToken();
+      } while (true);
     }
-    headerLine(_node) {
-      this.attributeList(_node);
-      this.tokenizer.nextToken();
+    inlineFragment(_node, snapshot, data, key = 'children') {
+      const value = new InlineFragment(snapshot, data, key, this.tokenizer);
+      this.onePropParsed(data, _node, key, value, false, true);
     }
-    attributeList(_node) {
+    attributeList(_node, data) {
       let key, eq;
-      const data = this.getData();
       while ((this.tokenizer.token.type & TokenType.NewLine) === 0) {
         if (key == null) {
           key = this.tokenizer.token.value;
@@ -2178,10 +2252,15 @@
         }
         this.tokenizer.nextToken();
       }
+      return key;
     }
     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 +2310,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) => {
@@ -2255,6 +2336,15 @@
     };
     return onePropParsed;
   }
+  class InlineFragment {
+    [aoye.Keys.ProxyFreeObject] = true;
+    constructor(snapshot, data, key, tokenizer) {
+      this.snapshot = snapshot;
+      this.data = data;
+      this.key = key;
+      this.tokenizer = tokenizer;
+    }
+  }
 
   function bobe(fragments, ...values) {
     const ui = function ui(isSub) {
@@ -2301,6 +2391,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 +2426,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