@mpxjs/core 2.10.18-beta.2 → 2.10.18-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.18-beta.2",
+  "version": "2.10.18-beta.4",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",

package/src/core/proxy.js

@@ -166,7 +166,6 @@ export default class MpxProxy {
   }
 
   created () {
-    console.log('[mpx] create proxy instance')
     if (__mpx_dynamic_runtime__) {
       // 缓存上下文，在 destoryed 阶段删除
       contextMap.set(this.uid, this.target)
@@ -753,13 +752,6 @@ export default class MpxProxy {
     const moduleId = this.target.__moduleId
     const dynamicTarget = this.target.__dynamic
 
-    const debugConfig = typeof global.__getMpxRenderEffectDebugRules === 'function'
-      ? global.__getMpxRenderEffectDebugRules(this.options?.mpxFileResource)
-      : {
-          debug: 1,
-          name: `MpxRenderEffect-${this.options?.mpxFileResource || 'unknown'}`
-        }
-
     const effect = this.effect = new ReactiveEffect(() => {
       // pre render for props update
       if (this.propsUpdatedFlag) {
@@ -789,9 +781,8 @@ export default class MpxProxy {
       } else {
         this.render()
       }
-    }, () => queueJob(update), this.scope, this.scope, debugConfig.debug, debugConfig.name)
+    }, () => queueJob(update), this.scope)
 
-    console.log(`[mpx] ${this.options?.mpxFileResource} will initRender`)
     const update = this.update = effect.run.bind(effect)
     update.id = this.uid
     // render effect允许自触发

package/src/index.js

@@ -110,6 +110,7 @@ function use (plugin, options = {}) {
   extendProps(Mpx, proxyMpx, rawProps, options)
   extendProps(Mpx.prototype, proxyMpx.prototype, rawPrototypeProps, options)
   installedPlugins.push(plugin)
+  plugin.__installed = true
   return this
 }
 

package/src/observer/array.js

@@ -32,7 +32,7 @@ export const arrayMethods = Object.create(arrayProto)
       }
       if (inserted) ob.observeArray(inserted)
       // notify change
-      ob.dep.notify(method, '[Array Method]', '[Array Method]', new Error('此时被通知变更').stack)
+      ob.dep.notify()
     }
     return result
   })

package/src/observer/computed.js

@@ -3,7 +3,7 @@ import Dep from './dep'
 import { createRef } from './ref'
 import { ReactiveEffect } from './effect'
 
-export function computed (getterOrOptions, options = {}) {
+export function computed (getterOrOptions) {
   let getter, setter
   if (isFunction(getterOrOptions)) {
     getter = getterOrOptions
@@ -17,7 +17,7 @@ export function computed (getterOrOptions, options = {}) {
   let value
   const effect = new ReactiveEffect(getter, () => {
     dirty = true
-  }, undefined, options.debug || 0, options.name || 'anonymous computed')
+  })
 
   return createRef({
     get: () => {

package/src/observer/dep.js

@@ -7,50 +7,30 @@ let uid = 0
  * directives subscribing to it.
  */
 export default class Dep {
-  constructor (key) {
+  constructor () {
     this.id = uid++
     this.subs = []
-    this.addSubStacks = new Map()
-    this.key = key
   }
 
   addSub (sub) {
-    const addSubStack = new Error('此时被添加到订阅者列表').stack
-    this.addSubStacks.set(sub, addSubStack)
     this.subs.push(sub)
   }
 
   removeSub (sub) {
     remove(this.subs, sub)
-    this.addSubStacks.delete(sub)
   }
 
-  depend (key, value) {
+  depend () {
     if (Dep.target) {
-      // if (this.key === 'link_params' || key === 'link_params') console.log(new Error('此时被依赖').stack)
-      Dep.target.addDep(this, key, value)
+      Dep.target.addDep(this)
     }
   }
 
-  notify (key, value, oldvalue, stack) {
+  notify () {
     // stabilize the subscriber list first
     const subs = this.subs.slice()
-    try {
-      console.log('[Mpx Dep] notify ' +
-        this.subs.length +
-        ' subs, from ' +
-        key +
-        ': ' +
-        (typeof oldvalue === 'object' ? JSON.stringify(oldvalue) : oldvalue) +
-        ' -> ' +
-        (typeof value === 'object' ? JSON.stringify(value) : value) +
-        ', subs: ' +
-        subs.map(s => `id:${s.id} name:${s.name}`).join(', '))
-    } catch (e) {
-      // do nothing
-    }
     for (let i = 0, l = subs.length; i < l; i++) {
-      subs[i].update(key, value, oldvalue, stack, this.addSubStacks.get(subs[i]))
+      subs[i].update()
     }
   }
 }

package/src/observer/effect.js

@@ -17,8 +17,6 @@ export function resetTracking () {
   shouldTrack = last === undefined ? true : last
 }
 
-global.__setMpxReactiveEffect = (value) => {}
-
 export class ReactiveEffect {
   active = true
   deps = []
@@ -26,45 +24,15 @@ export class ReactiveEffect {
   depIds = new Set()
   newDepIds = new Set()
   allowRecurse = false
-  debug = 0
-  name = 'no-name'
 
   constructor (
     fn,
     scheduler,
-    scope,
-    debug,
-    name
+    scope
   ) {
-    this.debug = debug || 0
-    this.name = name || 'no-name'
     this.id = ++uid
-    this.fn = (...args) => {
-      this.debug > 0 && console.log(`[Mpx Effect] id:${this.id} name: ${this.name} will run`)
-      this.debug > 1 && console.log(new Error('此时触发了run').stack)
-      const t = global.__setMpxReactiveEffect
-      global.__setMpxReactiveEffect = (option) => {
-        Object.entries(option).forEach(([key, value]) => {
-          this[key] = value
-        })
-      }
-      const result = fn(...args)
-      global.__setMpxReactiveEffect = t
-      return result
-    }
-    this.scheduler = (...args) => {
-      this.debug > 0 && console.log(`[Mpx Effect] id:${this.id} name: ${this.name} will scheduled`)
-      this.debug > 1 && console.log(new Error('此时触发scheduler').stack)
-      const t = global.__setMpxReactiveEffect
-      global.__setMpxReactiveEffect = (option) => {
-        Object.entries(option).forEach(([key, value]) => {
-          this[key] = value
-        })
-      }
-      const result = scheduler(...args)
-      global.__setMpxReactiveEffect = t
-      return result
-    }
+    this.fn = fn
+    this.scheduler = scheduler
     this.pausedState = PausedState.resumed
     recordEffectScope(this, scope)
   }
@@ -85,14 +53,14 @@ export class ReactiveEffect {
   }
 
   // add dependency to this
-  addDep (dep, key, value) {
+  addDep (dep) {
     if (!shouldTrack) return
     const id = dep.id
     if (!this.newDepIds.has(id)) {
       this.newDepIds.add(id)
       this.newDeps.push(dep)
       if (!this.depIds.has(id)) {
-        dep.addSub(this, key, value)
+        dep.addSub(this)
       }
     }
   }
@@ -117,20 +85,12 @@ export class ReactiveEffect {
   }
 
   // same as trigger
-  update (key, value, oldvalue, stack, fromAddSubStack) {
-    const debugOptions = global.__getMpxReactiveEffectDebugRules?.(key, value)
-    const debug = debugOptions ? debugOptions.debug : this.debug
+  update () {
     // avoid dead cycle
     if (Dep.target !== this || this.allowRecurse) {
       if (this.pausedState !== PausedState.resumed) {
-        debug > 0 && console.log(`[Mpx Effect] id:${this.id} name: ${this.name} pausedState will set to dirty with, from ${key}: ${typeof value === 'object' ? JSON.stringify(value) : value}`)
-        debug > 1 && console.log(stack)
-        debug > 2 && console.log(fromAddSubStack)
         this.pausedState = PausedState.dirty
       } else {
-        debug > 0 && console.log(`[Mpx Effect] id:${this.id} name: ${this.name} will updated, from ${key}: ${typeof value === 'object' ? JSON.stringify(value) : value}`)
-        debug > 1 && console.log(stack)
-        debug > 2 && console.log(fromAddSubStack)
         this.scheduler ? this.scheduler() : this.run()
       }
     }

package/src/observer/reactive.js

@@ -110,7 +110,7 @@ function observe (value, shallow) {
  * Define a reactive property on an Object.
  */
 export function defineReactive (obj, key, val, shallow) {
-  const dep = new Dep(key)
+  const dep = new Dep()
 
   const property = Object.getOwnPropertyDescriptor(obj, key)
   if (property && property.configurable === false) {
@@ -121,8 +121,6 @@ export function defineReactive (obj, key, val, shallow) {
   const getter = property && property.get
   const setter = property && property.set
 
-  const stack = new Error().stack
-
   let childOb = shallow ? getObserver(val) : observe(val)
   Object.defineProperty(obj, key, {
     enumerable: true,
@@ -130,9 +128,9 @@ export function defineReactive (obj, key, val, shallow) {
     get: function reactiveGetter () {
       const value = getter ? getter.call(obj) : val
       if (Dep.target) {
-        dep.depend(key, value)
+        dep.depend()
         if (childOb) {
-          childOb.dep.depend(key, value)
+          childOb.dep.depend()
           if (Array.isArray(value)) {
             dependArray(value)
           }
@@ -142,12 +140,10 @@ export function defineReactive (obj, key, val, shallow) {
     },
     set: function reactiveSetter (newVal) {
       const value = getter ? getter.call(obj) : val
-      let oldVal = value
       if (!(shallow && isForceTrigger) && !hasChanged(newVal, value)) {
         return
       }
       if (!shallow && isRef(value) && !isRef(newVal)) {
-        oldVal = value.value
         value.value = newVal
       } else if (setter) {
         setter.call(obj, newVal)
@@ -155,7 +151,7 @@ export function defineReactive (obj, key, val, shallow) {
         val = newVal
       }
       childOb = shallow ? getObserver(newVal) : observe(newVal)
-      dep.notify(key, newVal, oldVal, stack)
+      dep.notify()
     }
   })
 }
@@ -180,9 +176,8 @@ export function set (target, key, val) {
     target[key] = val
     return val
   }
-  const oldVal = target[key]
   defineReactive(ob.value, key, val, ob.shallow)
-  ob.dep.notify(key, val, oldVal, new Error('此时被通知变更').stack)
+  ob.dep.notify()
   return val
 }
 
@@ -198,12 +193,11 @@ export function del (target, key) {
   if (!hasOwn(target, key)) {
     return
   }
-  const oldVal = target[key]
   delete target[key]
   if (!ob) {
     return
   }
-  ob.dep.notify(key, undefined, oldVal, new Error('此时被通知变更').stack)
+  ob.dep.notify()
 }
 
 /**
@@ -214,7 +208,7 @@ function dependArray (arr) {
   for (let i = 0, l = arr.length; i < l; i++) {
     const item = arr[i]
     const ob = getObserver(item)
-    ob && ob.dep.depend(i, item)
+    ob && ob.dep.depend()
     if (Array.isArray(item)) {
       dependArray(item)
     }

package/src/observer/watch.js

@@ -137,7 +137,7 @@ export function watch (source, cb, options = {}) {
 
   job.allowRecurse = !!cb
 
-  const effect = new ReactiveEffect(getter, scheduler, undefined, options.debug || 0, options.name || 'anonymous watch')
+  const effect = new ReactiveEffect(getter, scheduler)
 
   if (cb) {
     if (immediate) {

package/src/platform/patch/getDefaultOptions.ios.js

@@ -33,13 +33,12 @@ function getSystemInfo () {
   }
 }
 
-function createEffect (proxy, componentsMap, rawOptions) {
+function createEffect (proxy, componentsMap) {
   const update = proxy.update = () => {
     // react update props in child render(async), do not need exec pre render
     // if (proxy.propsUpdatedFlag) {
     //   proxy.updatePreRender()
     // }
-    // console.log(`[mpx] ${proxy.options?.mpxFileResource} 组件render响应时数据变更，开始修改stateVersion，驱动组件更新`)
     if (proxy.isMounted()) {
       proxy.callHook(BEFOREUPDATE)
       proxy.pendingUpdatedFlag = true
@@ -62,18 +61,11 @@ function createEffect (proxy, componentsMap, rawOptions) {
     return createElement(type, ...rest)
   }
 
-  const debugConfig = typeof global.__getMpxRenderEffectDebugRules === 'function'
-? global.__getMpxRenderEffectDebugRules(rawOptions.mpxFileResource)
-: {
-    debug: 1,
-    name: `MpxRenderEffect-${rawOptions.mpxFileResource || 'unknown'}`
-  }
-
   proxy.effect = new ReactiveEffect(() => {
     // reset instance
     proxy.target.__resetInstance()
     return callWithErrorHandling(proxy.target.__injectedRender.bind(proxy.target), proxy, 'render function', [innerCreateElement, getComponent])
-  }, () => { return queueJob(update) }, proxy.scope, debugConfig.debug, debugConfig.name)
+  }, () => queueJob(update), proxy.scope)
   // render effect允许自触发
   proxy.toggleRecurse(true)
 }
@@ -340,7 +332,7 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
     stateVersion: Symbol(),
     subscribe: (onStoreChange) => {
       if (!proxy.effect) {
-        createEffect(proxy, componentsMap, rawOptions)
+        createEffect(proxy, componentsMap)
         proxy.stateVersion = Symbol()
       }
       proxy.onStoreChange = onStoreChange
@@ -356,7 +348,7 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
   })
   // react数据响应组件更新管理器
   if (!proxy.effect) {
-    createEffect(proxy, componentsMap, rawOptions)
+    createEffect(proxy, componentsMap)
   }
 
   return instance
@@ -733,15 +725,6 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
       proxy.memoVersion = Symbol()
     }
 
-    // if (rawOptions.mpxFileResource.includes('nav.mpx')) {
-    //   const stateVersionChange = proxy.stateVersion === global.__mpxNavStateVersion
-    //   const memoVersionChange = proxy.memoVersion === global.__mpxNavMemoVersion
-    //   const propsChange = props === global.__mpxNavProps
-    //   console.log(`[mpx] nav.mpx render, stateVersionChange: ${stateVersionChange}, memoVersionChange: ${memoVersionChange}, propsChange: ${propsChange}`)
-    //   global.__mpxNavStateVersion = proxy.stateVersion
-    //   global.__mpxNavMemoVersion = proxy.memoVersion
-    //   global.__mpxNavProps = props
-    // }
     const finalMemoVersion = useMemo(() => {
       if (!hasPendingJob(proxy.update)) {
         proxy.finalMemoVersion = Symbol()