refactor context

baidu · Feb 23, 2022 · a75819f · a75819f
1 parent 1619522
commit a75819f
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 12 deletions.
diff --git a/index.js b/index.js
@@ -97,6 +97,41 @@ function getComputedWatcher(name, fn) {
     };
 }
 
+function getComponentContext(instance) {
+    return {
+        el() {
+            return instance.el;
+        },
+        owner() {
+            return instance.owner;
+        },
+        parentComponent() {
+            return instance.parentComponent;
+        },
+        dispatch(...args) {
+            instance.dispatch.apply(instance, args);
+        },
+        fire(...args) {
+            instance.fire.apply(instance, args);
+        },
+        ref(name) {
+            return instance.ref(name);
+        },
+        nextTick(...args) {
+            instance.nextTick(args);
+        },
+        data: {
+            get(key) {
+                return instance.data.get(key);
+            },
+            set(key, val) {
+                instance.data.set(key, val);
+            }
+            // TODO: 其他方法
+        }
+    };
+}
+
 
 /**
  * 通过组合式API定义San组件
@@ -134,7 +169,7 @@ export function defineComponent(creator, san) {
         contexts.push(context);
 
         let creatorAsInstance = defineContext.creator;
-        creatorAsInstance(this);
+        creatorAsInstance(getComponentContext(this));
 
         contexts.pop();
         context = contexts[contexts.length - 1];

diff --git a/test/lifeCycle.spec.js b/test/lifeCycle.spec.js
@@ -234,10 +234,10 @@ describe('[life cycle]: ', () => {
 
             onConstruct(function (options) {
                 expect(options.from).toBe('err');
-                expect(typeof context.template).toBe('string');
-                expect(context.data).toBeUndefined();
-                expect(context.scope).toBeUndefined();
-                expect(context.owner).toBeUndefined();
+                // expect(typeof context.template).toBe('string');
+                // expect(context.data).toBeUndefined();
+                // expect(context.scope).toBeUndefined();
+                expect(context.owner()).toBeUndefined();
             });
         });
 
@@ -342,12 +342,12 @@ describe('[life cycle]: ', () => {
             });
 
             onCreated(function () {
-                expect(context.el.tagName).toBe('U');
+                expect(context.el().tagName).toBe('U');
                 uState.created = 1;
             });
 
             onAttached(function () {
-                expect(context.el.tagName).toBe('U');
+                expect(context.el().tagName).toBe('U');
                 uState.attached = 1;
             });
 
@@ -377,12 +377,12 @@ describe('[life cycle]: ', () => {
             })
 
             onCreated(function () {
-                expect(context.el.tagName).toBe('B');
+                expect(context.el().tagName).toBe('B');
                 mainState.created = 1;
             })
 
             onAttached(function () {
-                expect(context.el.tagName).toBe('B');
+                expect(context.el().tagName).toBe('B');
                 mainState.attached = 1;
             });
 

diff --git a/test/messages.spec.js b/test/messages.spec.js
@@ -48,7 +48,7 @@ describe('[messages]: ', () => {
             });
 
             onAttached(function () {
-                item = context.el;
+                item = context.el();
                 context.dispatch('UI:select-item-attached');
             });
 
@@ -155,7 +155,7 @@ describe('[messages]: ', () => {
             });
 
             onAttached(function () {
-                item = context.el;
+                item = context.el();
                 context.dispatch('UI:select-item-attached');
             });
 
@@ -276,7 +276,7 @@ describe('[messages]: ', () => {
             });
 
             onAttached(function () {
-                item = context.el;
+                item = context.el();
                 context.dispatch('UI:select-item-attached');
             });