bobe 0.0.66 → 0.0.68

package/dist/index.umd.js

@@ -23,6 +23,7 @@
     TokenType[TokenType["Comment"] = 32768] = "Comment";
     return TokenType;
   }({});
+  const ChildrenSugarType = TokenType.String | TokenType.InsertionExp;
   const BaseTokenType = TokenType.String | TokenType.Number | TokenType.Boolean | TokenType.Null | TokenType.Undefined;
   const ValueTokenType = BaseTokenType | TokenType.InsertionExp | TokenType.StaticInsExp;
   let FakeType = function (FakeType) {
@@ -1098,7 +1099,7 @@
       if (value === 'for') {
         return this.parseLoopNode();
       }
-      if (hookType) {
+      if (hookType || this.tokenizer.token.type & TokenType.String) {
         return this.parseComponentNode();
       }
       return this.parseElementNode();
@@ -1119,9 +1120,9 @@
       const tagToken = this.tokenizer.token;
       if (!(tagToken.type & TokenType.Identifier)) {
         this.addError(ParseErrorCode.INVALID_TAG_NAME, `无效的标签名，期望标识符但得到 "${tagToken.value}"`, tagToken.loc ?? this.tokenizer.emptyLoc(), node);
-        while (!(this.tokenizer.token.type & TokenType.NewLine) && !this.tokenizer.isEof()) {
+        do {
           this.tokenizer.nextToken();
-        }
+        } while (!(this.tokenizer.token.type & TokenType.NewLine) && !this.tokenizer.isEof());
         return null;
       }
       const tagName = tagToken.value;
@@ -1227,6 +1228,17 @@
     }
     parseProperty(node) {
       node.type = NodeType.Property;
+      if (this.tokenizer.token.type & ChildrenSugarType) {
+        node.key = {
+          type: NodeType.PropertyKey,
+          key: 'children',
+          loc: this.tokenizer.token.loc ?? this.tokenizer.emptyLoc()
+        };
+        node.value = this.parseJsExp();
+        this.tokenizer.nextToken();
+        this.handleKeyValueLoc(node);
+        return node;
+      }
       if (this.tokenizer.token.type !== TokenType.Identifier) {
         this.addError(ParseErrorCode.INVALID_PROP_KEY, `属性名 "${this.tokenizer.token.value}" 不合法`, this.tokenizer.token.loc ?? this.tokenizer.emptyLoc(), node);
         this.tokenizer.nextToken();
@@ -1432,14 +1444,22 @@
   }
   const isUI = fn => typeof fn === 'function' && fn.__BOBE_IS_UI;
   const isRenderAble = val => aoye.isStore(val) || isUI(val) || val instanceof InlineFragment;
+  const SAFE_HAS = () => true;
   const SAFE_HANDLER = {
-    has: () => true,
-    get: (t, k) => {
-      if (typeof k === 'symbol') return t[k];
-      return t[k];
-    }
+    has: SAFE_HAS,
+    get: (t, k, r) => Reflect.get(t, k, r)
   };
   const safe = data => new Proxy(data, SAFE_HANDLER);
+  const safeExclude = (data, excludes) => {
+    const proxy = new Proxy(data, SAFE_HANDLER);
+    return new Proxy(proxy, {
+      has: SAFE_HAS,
+      get(t, k, r) {
+        if (k === Symbol.unscopables) return excludes;
+        return Reflect.get(t, k, r);
+      }
+    });
+  };
 
   const KEY_INDEX = '__BOBE_KEY_INDEX';
   let _ctxStack;
@@ -1663,11 +1683,14 @@
             _node = this.componentOrFragmentDeclaration(value, ctx);
           } else {
             _node = this.createNode('text');
-            this.setProp(_node, 'text', String(value));
+            this.setProp(_node, 'children', String(value));
           }
         } else {
           return this.dynamicDeclaration(data, value, ctx);
         }
+      } else if (this.tokenizer.token.type === TokenType.String) {
+        _node = this.createNode('text');
+        this.setProp(_node, 'children', String(value));
       } else {
         _node = this.createNode(value);
       }
@@ -1748,7 +1771,7 @@
           if (isNewTextNode) {
             textNode = node.textNode = this.createNode('text');
           }
-          this.setProp(textNode, 'text', String(val));
+          this.setProp(textNode, 'children', String(val));
           if (isNewTextNode) {
             if (isUpdate) {
               this.handleInsert(node.realParent, textNode, node.realBefore);
@@ -2361,7 +2384,9 @@
     }
     getAssignFn(data, expression) {
       const valueId = `value_bobe_${bobeShared.date32()}`;
-      return new Function('data', valueId, `with(data){${expression}=${valueId}};`).bind(undefined, data);
+      return new Function('data', valueId, `with(data){${expression}=${valueId}};`).bind(undefined, safeExclude(data, {
+        [valueId]: true
+      }));
     }
     condDeclaration(ctx) {
       const prevSibling = ctx.prevSibling;
@@ -2525,7 +2550,14 @@
       let key, eq;
       while ((this.tokenizer.token.type & TokenType.NewLine) === 0) {
         if (key == null) {
-          key = this.tokenizer.token.value;
+          const keyValue = this.tokenizer.token.value;
+          if (this.tokenizer.token.type & ChildrenSugarType || typeof keyValue === 'string' && keyValue.startsWith(this.tokenizer.HookId)) {
+            key = 'children';
+            eq = '=';
+            continue;
+          } else {
+            key = this.tokenizer.token.value;
+          }
         } else if (eq == null) {
           eq = '=';
         } else {