j-component 1.4.7 → 1.4.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "j-component",
-  "version": "1.4.7",
+  "version": "1.4.9",
   "description": "miniprogram custom component framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -47,6 +47,6 @@
   "dependencies": {
     "expr-parser": "^1.0.0",
     "miniprogram-api-typings": "^3.2.2",
-    "miniprogram-exparser": "2.29.0"
+    "miniprogram-exparser": "latest"
   }
 }

package/src/componentmanager.js

@@ -128,6 +128,15 @@ class ComponentManager {
           const exparserNodes = this.shadowRoot.querySelectorAll(selector)
           return exparserNodes.map(item => getSelectComponentResult(item))
         }
+        caller.selectOwnerComponent = () => {
+          const ownerShadowRoot = this.ownerShadowRoot
+          if (!(ownerShadowRoot instanceof exparser.ShadowRoot)) return null
+
+          const exparserNode = ownerShadowRoot.getHostNode()
+          if (!exparserNode) return null
+
+          return getSelectComponentResult(exparserNode)
+        } 
         caller.createSelectorQuery = () => new SelectorQuery(caller)
         caller.createIntersectionObserver = options => new IntersectionObserver(caller, options)
         caller.setData = (data, callback) => {

package/src/render/component.js

@@ -60,10 +60,10 @@ function exparserTreeToJSON(node) {
     let children = array
     const vt = node._vt
 
-    if (vt) {
-      if (vt.type === CONSTANT.TYPE_TEXT) {
-        array.push(vt.content)
-      } else if (vt.type === CONSTANT.TYPE_NATIVE || vt.type === CONSTANT.TYPE_COMPONENT) {
+    if (node instanceof exparser.TextNode) {
+      array.push(node.textContent)
+    } else if (node instanceof exparser.Element) {
+      if (!node.__virtual) {
         children = []
         const child = {
           tagName: _.getTagName(vt.componentId || vt.tagName) || vt.tagName,
@@ -78,10 +78,9 @@ function exparserTreeToJSON(node) {
         })
         array.push(child)
       }
+      ;(node.__wxSlotChildren || []).forEach(child => _inner(child, children))
     }
 
-    (node.__wxSlotChildren || []).forEach(child => _inner(child, children))
-
     return array
   }