@mpxjs/core 2.9.9 → 2.9.11-test.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.9.9",
+  "version": "2.9.11-test.0",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.9.1",
+    "@mpxjs/utils": "^2.8.40-test.2",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "7ec6526f024c00f9c6b935c631bfdc61be27b69b"
+  "gitHead": "d244d661acb081b709fc99ca8f6add541f793877"
 }

package/src/observer/scheduler.js

@@ -69,10 +69,11 @@ export function queueJob (job) {
   // if the job is a watch() callback, the search will start with a +1 index to
   // allow it recursively trigger itself - it is the user's responsibility to
   // ensure it doesn't end up in an infinite loop.
-  if ((!queue.length ||
-    !queue.includes(job, isFlushing && job.allowRecurse ? flushIndex + 1 : flushIndex)) &&
-    job !== currentPreFlushParentJob
-  ) {
+  if ((
+      !queue.length ||
+      !queue.includes(job, isFlushing && job.allowRecurse ? flushIndex + 1 : flushIndex)
+    ) &&
+    job !== currentPreFlushParentJob) {
     if (job.id == null) {
       queue.push(job)
     } else {
@@ -93,11 +94,17 @@ function queueFlush () {
   }
 }
 
+// todo follow vue
 export function flushPreFlushCbs (seen, parentJob = null) {
   if (pendingPreFlushCbs.length) {
-    currentPreFlushParentJob = parentJob
-    activePreFlushCbs = [...new Set(pendingPreFlushCbs)]
+    const deduped = [...new Set(pendingPreFlushCbs)]
     pendingPreFlushCbs.length = 0
+    if (activePreFlushCbs) {
+      activePreFlushCbs.push(...deduped)
+      return
+    }
+    currentPreFlushParentJob = parentJob
+    activePreFlushCbs = deduped
     if (isDev) seen = seen || new Map()
     for (
       preFlushIndex = 0;
@@ -117,10 +124,14 @@ export function flushPreFlushCbs (seen, parentJob = null) {
 
 export function flushPostFlushCbs (seen) {
   if (pendingPostFlushCbs.length) {
-    activePostFlushCbs = [...new Set(pendingPostFlushCbs)]
+    const deduped = [...new Set(pendingPostFlushCbs)]
     pendingPostFlushCbs.length = 0
+    if (activePostFlushCbs) {
+      activePostFlushCbs.push(...deduped)
+      return
+    }
+    activePostFlushCbs = deduped
     if (isDev) seen = seen || new Map()
-
     // activePostFlushCbs.sort((a, b) => getId(a) - getId(b))
     for (
       postFlushIndex = 0;

package/src/platform/builtInMixins/refsMixin.web.js

@@ -1,5 +1,5 @@
 import { BEFOREMOUNT, UPDATED } from '../../core/innerLifecycle'
-import * as webApi from '@mpxjs/api-proxy/src/web/api'
+import { createSelectorQuery } from '@mpxjs/api-proxy'
 
 function getEl (ref) {
   if (ref && ref.nodeType === 1) return ref
@@ -14,13 +14,13 @@ function processRefs (refs) {
       const ref = refs[key]
       if (Array.isArray(ref)) {
         if (getEl(ref[0])) {
-          refs[rKey] = webApi.createSelectorQuery().in(this).selectAll(ref.map(getEl))
+          refs[rKey] = createSelectorQuery().in(this).selectAll(ref.map(getEl))
         } else {
           refs[rKey] = ref
         }
       } else {
         if (getEl(ref)) {
-          refs[rKey] = webApi.createSelectorQuery().in(this).select(getEl(ref))
+          refs[rKey] = createSelectorQuery().in(this).select(getEl(ref))
         } else {
           refs[rKey] = ref
         }

package/src/vuePlugin.js

@@ -1,5 +1,5 @@
 import { walkChildren, parseSelector, error, hasOwn } from '@mpxjs/utils'
-import * as webApi from '@mpxjs/api-proxy/src/web/api'
+import { createSelectorQuery, createIntersectionObserver } from '@mpxjs/api-proxy'
 const datasetReg = /^data-(.+)$/
 
 function collectDataset (attrs) {
@@ -50,9 +50,9 @@ export default function install (Vue) {
     return this.selectComponent(selector, true)
   }
   Vue.prototype.createSelectorQuery = function () {
-    return webApi.createSelectorQuery().in(this)
+    return createSelectorQuery().in(this)
   }
-  Vue.prototype.createIntersectionObserver = function (options) {
-    return webApi.createIntersectionObserver(this, options)
+  Vue.prototype.createIntersectionObserver = function (component, options) {
+    return createIntersectionObserver(this, options)
   }
 }