bobe 0.0.48 → 0.0.49

package/dist/bobe.cjs.js

@@ -106,10 +106,13 @@ class Tokenizer {
     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 +142,23 @@ class Tokenizer {
   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 +171,10 @@ class Tokenizer {
     }
     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 +197,7 @@ class Tokenizer {
         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 +210,9 @@ class Tokenizer {
             break;
           }
           this.dentStack.pop();
+          if (expLen > targetDentLen) {
+            continue;
+          }
           if (!this.token) {
             this.setToken(TokenType.Dedent, String(expLen));
           } else {
@@ -252,29 +267,31 @@ class Tokenizer {
       }
       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 +316,7 @@ class Tokenizer {
                   }
                   break;
               }
-              if (false) ;
+              this.locEnd();
               break;
           }
           this.next();
@@ -315,6 +332,10 @@ class Tokenizer {
       this.handledTokens.push(this.token);
     }
   }
+  locStart() {
+  }
+  locEnd() {
+  }
   getComment() {
     let value = '/';
     let nextC = this.code[this.i + 1];
@@ -331,6 +352,7 @@ class Tokenizer {
     this.getComment();
   }
   condExp() {
+    this.locStart();
     let value = '';
     this.token = null;
     let char = this.code[this.i];
@@ -345,12 +367,14 @@ class Tokenizer {
     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 +388,7 @@ class Tokenizer {
     }
     this.setToken(TokenType.Identifier, value, 0);
     this.handledTokens.push(this.token);
+    this.locEnd();
     return this.token;
   }
   peekChar() {
@@ -551,7 +576,7 @@ class Tokenizer {
     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 +591,7 @@ class Tokenizer {
         }
         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 +1000,7 @@ var NodeType = function (NodeType) {
 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 +1102,9 @@ class Compiler {
   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 +1122,9 @@ class Compiler {
     }
     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 +1198,17 @@ class Compiler {
   }
   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 +1232,35 @@ class Compiler {
     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 +1285,12 @@ class Compiler {
     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 +1514,9 @@ class Interpreter {
           }
           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 +1611,7 @@ class Interpreter {
       } 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 +1623,15 @@ class Interpreter {
       _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;
   }
@@ -1959,16 +2007,25 @@ class Interpreter {
   }
   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 +2033,9 @@ class Interpreter {
       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');
@@ -2113,26 +2172,38 @@ class Interpreter {
       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;
@@ -2180,6 +2251,7 @@ class Interpreter {
       }
       this.tokenizer.nextToken();
     }
+    return key;
   }
   config(opt) {
     Object.assign(this, opt);
@@ -2263,6 +2335,15 @@ function createStoreOnePropParsed(child) {
   };
   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) {