Merge branch 'dev-owndoc'

baidu · Dec 6, 2023 · 4128a66 · 4128a66
2 parents 1d880c6 + f46d0a9
commit 4128a66
Show file tree

Hide file tree

Showing 30 changed files with 699 additions and 132 deletions.
diff --git a/doc/anode-pack.md b/doc/anode-pack.md
@@ -1170,4 +1170,50 @@ aPack = [1,"u",1,45,6,1,3,"cmpt"]
     "tagName": "u"
 }
 */
-```
+```
+
+
+### var
+
+- head: 46
+- 编码序: `{string}name, {Node}expr`
+
+```js
+aPack = [1,"my-ui",1,46,"title",9,,2,3,"Hello ",7,,6,1,3,"name",]
+/*
+{
+    "directives": {},
+    "props": [],
+    "events": [],
+    "children": [],
+    "tagName": "my-ui",
+    "attrs": [
+        {
+            "name": "title",
+            "expr": {
+                "type": 7,
+                "segs": [
+                    {
+                        "type": 1,
+                        "value": "Hello "
+                    },
+                    {
+                        "type": 5,
+                        "expr": {
+                            "type": 4,
+                            "paths": [
+                                {
+                                    "type": 1,
+                                    "value": "name"
+                                }
+                            ]
+                        },
+                        "filters": []
+                    }
+                ]
+            }
+        }
+    ]
+}
+*/
+```
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -54,8 +54,8 @@
     "karma-sourcemap-loader": "^0.3.7",
     "mustache": "^3.0.1",
     "opener": "^1.5.1",
-    "san-anode-cases": "^3.10.1",
-    "san-html-cases": "^3.13.4",
+    "san-anode-cases": "^3.14.0",
+    "san-html-cases": "^3.14.0",
     "source-map": "^0.7.3",
     "swig-templates": "^2.0.3",
     "typescript": "^4.3.5",

diff --git a/src/browser/input-event-compatible.js b/src/browser/input-event-compatible.js
diff --git a/src/browser/trigger.js b/src/browser/trigger.js
@@ -15,7 +15,7 @@
  * @param {string} eventName 事件名
  */
 function trigger(el, eventName) {
-    var event = document.createEvent('HTMLEvents');
+    var event = el.ownerDocument.createEvent('HTMLEvents');
     event.initEvent(eventName, true, true);
     el.dispatchEvent(event);
 }

diff --git a/src/main.js b/src/main.js
@@ -22,7 +22,6 @@
     // require('./util/next-tick');
     // require('./browser/ie');
     // require('./browser/ie-old-than-9');
-    // require('./browser/input-event-compatible');
     // require('./browser/auto-close-tags');
     // require('./util/data-types.js');
     // require('./util/create-data-types-checker.js');

diff --git a/src/parser/integrate-attr.js b/src/parser/integrate-attr.js
@@ -80,13 +80,28 @@ function integrateAttr(aNode, name, value, options) {
                 aNode.vars = [];
             }
 
-            realName = kebab2camel(realName);
             aNode.vars.push({
-                name: realName,
+                name: kebab2camel(realName),
                 expr: parseExpr(value.replace(/(^\{\{|\}\}$)/g, ''))
             });
             break;
 
+        case 'attr':
+            if (!aNode.attrs) {
+                aNode.attrs = [];
+            }
+
+            aNode.attrs.push({
+                name: realName,
+                expr: value
+                    ? parseText(value, options.delimiters)
+                    : boolAttrs[realName]
+                        ? {type: ExprType.BOOL, value: true}
+                        : {type: ExprType.STRING, value: ''}
+            });
+
+            break;
+
         default:
             if (prefix === 'prop') {
                 name = realName;
@@ -167,7 +182,6 @@ function integrateAttr(aNode, name, value, options) {
                                 }
                         }
                 }
-
             }
 
             aNode.props.push(

diff --git a/src/parser/unpack-anode.js b/src/parser/unpack-anode.js
@@ -211,6 +211,7 @@ function unpackANode(packed) {
                 break;
 
             case 36:
+            case 46:
                 node = {
                     name: packed[++i]
                 };
@@ -293,6 +294,11 @@ function unpackANode(packed) {
                                 current.vars.push(node);
                                 break;
 
+                            case 46:
+                                current.attrs = current.attrs || [];
+                                current.attrs.push(node);
+                                break;
+
                             case 37:
                                 current.directives['for'] = node;
                                 break;
@@ -390,12 +396,14 @@ function unpackANode(packed) {
                 // Expr: UNARY
                 // Prop
                 // var
+                // attr
                 // Object Spread Item, Array Item
                 case 11:
                 case 2:
                 case 33:
                 case 34:
                 case 36:
+                case 46:
                 case 15:
                 case 17:
                 case 18:

diff --git a/src/view/async-component.js b/src/view/async-component.js
@@ -10,7 +10,6 @@
 var guid = require('../util/guid');
 var each = require('../util/each');
 var insertBefore = require('../browser/insert-before');
-var nodeOwnCreateStump = require('./node-own-create-stump');
 var nodeOwnSimpleDispose = require('./node-own-simple-dispose');
 
 
@@ -35,7 +34,7 @@ function AsyncComponent(options, loader) {
             this.children[0] = new PlaceholderComponent(options);
         }
 
-        this._create();
+        this.el = hydrateWalker.doc.createComment(this.id);
         insertBefore(this.el, hydrateWalker.target, hydrateWalker.current);
 
         var me = this;
@@ -47,7 +46,6 @@ function AsyncComponent(options, loader) {
     // #[end]
 }
 
-AsyncComponent.prototype._create = nodeOwnCreateStump;
 AsyncComponent.prototype.dispose = nodeOwnSimpleDispose;
 
 /**
@@ -64,7 +62,7 @@ AsyncComponent.prototype.attach = function (parentEl, beforeEl) {
         component.attach(parentEl, beforeEl);
     }
 
-    this._create();
+    this.el = parentEl.ownerDocument.createComment(this.id);
     insertBefore(this.el, parentEl, beforeEl);
 
     var me = this;