fix(reflect): Remove unnecessary base class when create class using p…

…roperty definition
plumier · Dec 9, 2022 · 92a7eea · 92a7eea
1 parent 2cc9e82
commit 92a7eea
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/packages/reflect/src/helpers.ts b/packages/reflect/src/helpers.ts
@@ -87,8 +87,9 @@ interface CreateClassOption {
 
 function createClass(definition: CustomTypeDefinition, opt?: Partial<CreateClassOption>): Class {
     class Base { }
-    const {extends:BaseClass, ...option} = { extends: Base, name: "DynamicType", genericParams: [], ...opt }
-    const type = { [option.name]: class extends BaseClass { } }[option.name];
+    const {extends:BaseClass, ...option} = { name: "DynamicType", genericParams: [], ...opt }
+    const obj = !!BaseClass ? { [option.name]: class extends BaseClass { } } : { [option.name]: class { } }
+    const type = obj[option.name];
     (type as any)[IsDynamicType] = true
     for (const key in definition) {
         Reflect.decorate([decorate.type(definition[key])], type.prototype, key)

diff --git a/packages/reflect/src/parser.ts b/packages/reflect/src/parser.ts
@@ -58,9 +58,14 @@ function getNamesFromAst(nodes: any[]) {
 }
 
 function getCode(fn: Class | Function) {
+    const syntaxReplacement = [
+        { pattern: /^class(\s*)extends\s*BaseClass\s*{\s*}/gm, replacement: "class DynamicClass extends Parent {}" },
+        { pattern: /^class(\s*){\s*}/gm, replacement: "class DynamicClass {}" },
+    ]
     const code = fn.toString()
-    if (code.search(/^class(\s*)extends\s*BaseClass\s*{\s*}/gm) > -1) {
-        return "class DynamicClass extends Parent {}"
+    const exclude = syntaxReplacement.find(x => code.search(x.pattern) > -1)
+    if (exclude) {
+        return exclude.replacement
     }
     else
         return code.replace("[native code]", "")

diff --git a/tests/behavior/reflect/__snapshots__/create.spec.ts.snap b/tests/behavior/reflect/__snapshots__/create.spec.ts.snap
@@ -145,7 +145,7 @@ Object {
       "typeClassification": "Array",
     },
   ],
-  "super": Base,
+  "super": Object,
   "type": DynamicType,
   "typeClassification": "Class",
 }
@@ -210,7 +210,7 @@ Object {
       "typeClassification": "Primitive",
     },
   ],
-  "super": Base,
+  "super": Object,
   "type": DynamicType,
   "typeClassification": "Class",
 }
@@ -255,7 +255,7 @@ Object {
       "typeClassification": "Class",
     },
   ],
-  "super": Base,
+  "super": Object,
   "type": DynamicType,
   "typeClassification": "Class",
 }
@@ -320,7 +320,7 @@ Object {
       "typeClassification": "Primitive",
     },
   ],
-  "super": Base,
+  "super": Object,
   "type": DynamicType,
   "typeClassification": "Class",
 }

diff --git a/tests/behavior/reflect/__snapshots__/decorators.spec.ts.snap b/tests/behavior/reflect/__snapshots__/decorators.spec.ts.snap
@@ -2486,7 +2486,7 @@ Object {
       "typeClassification": "Primitive",
     },
   ],
-  "super": Base,
+  "super": Object,
   "type": DynamicType,
   "typeClassification": "Class",
 }
@@ -2595,7 +2595,7 @@ Object {
       "typeClassification": "Primitive",
     },
   ],
-  "super": Base,
+  "super": Object,
   "type": DynamicType,
   "typeClassification": "Class",
 }