fix: Change super name into DynamicType (#67)

ktutnik · Jun 6, 2020 · 0102fd6 · 0102fd6
1 parent 728c491
commit 0102fd6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/src/decorators.ts b/src/decorators.ts
@@ -160,7 +160,7 @@ export namespace generic {
      * @param params List of generic type parameters
      */
     export function create<T extends Class>(parent: T | { parent: T, name: string }, ...params: TypeOverride[]) {
-        const opt = (typeof parent === "object") ? parent : { parent: parent, name: parent.name }
+        const opt = (typeof parent === "object") ? parent : { parent: parent, name: "DynamicType" }
         const Type = metadata.createClass(opt.parent, opt.name)
         Reflect.decorate([generic.type(...params)], Type)
         return Type

diff --git a/src/parser.ts b/src/parser.ts
@@ -51,10 +51,8 @@ function getNamesFromAst(nodes: any[]) {
 
 function getCode(fn:Class|Function){
     const code = fn.toString()
-    if(code === "class extends parent {}") {
-        const token = code.split(" ")
-        token.splice(1, 0, "DynamicClass")
-        return token.join(" ")
+    if(code.search(/^class(\s*)extends\s*parent\s*{\s*}/gm) > -1) {
+        return "class DynamicClass extends parent {}"
     }
     else 
         return code.replace("[native code]", "")

diff --git a/test/__snapshots__/generic.spec.js.snap b/test/__snapshots__/generic.spec.js.snap
@@ -378,7 +378,7 @@ Object {
   "decorators": Array [
     Object {
       "kind": "GenericType",
-      "target": SuperClass,
+      "target": DynamicType,
       "types": Array [
         Number,
         String,
@@ -411,10 +411,10 @@ Object {
       "typeClassification": "Primitive",
     },
   ],
-  "name": "SuperClass",
+  "name": "DynamicType",
   "properties": Array [],
   "super": SuperClass,
-  "type": SuperClass,
+  "type": DynamicType,
   "typeClassification": "Class",
 }
 `;
@@ -964,7 +964,7 @@ Object {
   "decorators": Array [
     Object {
       "kind": "GenericType",
-      "target": CustomGeneric,
+      "target": DynamicType,
       "types": Array [
         String,
       ],
@@ -977,7 +977,7 @@ Object {
   ],
   "kind": "Class",
   "methods": Array [],
-  "name": "CustomGeneric",
+  "name": "DynamicType",
   "properties": Array [
     Object {
       "decorators": Array [],
@@ -990,7 +990,7 @@ Object {
     },
   ],
   "super": CustomGeneric,
-  "type": CustomGeneric,
+  "type": DynamicType,
   "typeClassification": "Class",
 }
 `;
@@ -1005,7 +1005,7 @@ Object {
   "decorators": Array [
     Object {
       "kind": "GenericType",
-      "target": CustomGeneric,
+      "target": DynamicType,
       "types": Array [
         String,
       ],
@@ -1018,7 +1018,7 @@ Object {
   ],
   "kind": "Class",
   "methods": Array [],
-  "name": "CustomGeneric",
+  "name": "DynamicType",
   "properties": Array [
     Object {
       "decorators": Array [],
@@ -1031,7 +1031,7 @@ Object {
     },
   ],
   "super": CustomGeneric,
-  "type": CustomGeneric,
+  "type": DynamicType,
   "typeClassification": "Class",
 }
 `;
@@ -1046,7 +1046,7 @@ Object {
   "decorators": Array [
     Object {
       "kind": "GenericType",
-      "target": CustomGeneric,
+      "target": DynamicType,
       "types": Array [
         String,
       ],
@@ -1059,7 +1059,7 @@ Object {
   ],
   "kind": "Class",
   "methods": Array [],
-  "name": "CustomGeneric",
+  "name": "DynamicType",
   "properties": Array [
     Object {
       "decorators": Array [],
@@ -1072,7 +1072,7 @@ Object {
     },
   ],
   "super": CustomGeneric,
-  "type": CustomGeneric,
+  "type": DynamicType,
   "typeClassification": "Class",
 }
 `;
@@ -1087,7 +1087,7 @@ Object {
   "decorators": Array [
     Object {
       "kind": "GenericType",
-      "target": CustomGeneric,
+      "target": DynamicType,
       "types": Array [
         String,
       ],
@@ -1100,7 +1100,7 @@ Object {
   ],
   "kind": "Class",
   "methods": Array [],
-  "name": "CustomGeneric",
+  "name": "DynamicType",
   "properties": Array [
     Object {
       "decorators": Array [],
@@ -1113,7 +1113,7 @@ Object {
     },
   ],
   "super": CustomGeneric,
-  "type": CustomGeneric,
+  "type": DynamicType,
   "typeClassification": "Class",
 }
 `;