[fix] Property Descriptor bug of watch decorator at runtime

EasyWebApp · Feb 1, 2022 · 2118260 · 2118260
1 parent c7f06b0
commit 2118260
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on:
         tags:
             - v*
 jobs:
-    Build-and-Deploy:
+    Build-and-Publish:
         runs-on: ubuntu-latest
         steps:
             - name: Checkout

diff --git a/MobX/package.json b/MobX/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mobx-web-cell",
-    "version": "0.4.0-rc.3",
+    "version": "0.4.0-rc.4",
     "license": "LGPL-3.0",
     "author": "shiy2008@gmail.com",
     "description": "MobX adaptor for WebCell v2",
@@ -24,7 +24,7 @@
     },
     "dependencies": {
         "mobx": ">4.0.0 <6.0.0",
-        "web-cell": "^2.4.0-rc.4"
+        "web-cell": "^2.4.0-rc.5"
     },
     "devDependencies": {
         "@parcel/packager-ts": "^2.2.1",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "web-cell",
-    "version": "2.4.0-rc.4",
+    "version": "2.4.0-rc.5",
     "description": "Web Components engine based on JSX & TypeScript",
     "keywords": [
         "web",

diff --git a/source/decorator.ts b/source/decorator.ts
@@ -34,18 +34,15 @@ export function watch(
     meta?: PropertyDescriptor
 ) {
     const accessor = !!(meta?.get || meta?.set);
-    meta = meta || Object.getOwnPropertyDescriptor(prototype, key) || {};
 
-    meta.set =
-        meta.set ||
-        function (this: WebCellComponent, value) {
-            this.setProps({ [key]: value });
-        };
-    meta.get =
-        meta.get ||
-        function () {
-            return this.props[key];
-        };
+    if (!accessor) meta = {};
+
+    meta.set ||= function (this: WebCellComponent, value) {
+        this.setProps({ [key]: value });
+    };
+    meta.get ||= function () {
+        return this.props[key];
+    };
     (meta.configurable = true), (meta.enumerable = true);
 
     if (!accessor) Object.defineProperty(prototype, key, meta);