Merge aaec9bd into b197345

plumier · Jan 7, 2023 · b02b067 · b02b067
2 parents b197345 + aaec9bd
commit b02b067
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 4 deletions.
diff --git a/packages/reflect/src/helpers.ts b/packages/reflect/src/helpers.ts
@@ -45,12 +45,28 @@ namespace reflection {
             case Number:
             case Object:
             case Date:
+            case Promise:
                 return false
             default:
                 return true
         }
     }
 
+    export function isPrimitive(type:Function) {
+        switch (type) {
+            case Boolean:
+            case String:
+            case Array:
+            case Number:
+            case Object:
+            case Date:
+            case Promise:
+                return true
+            default:
+                return false
+        }
+    }
+
     export function getMethods(meta: ClassReflection) {
         return meta.methods.map(x => ({
             name: x.name,

diff --git a/packages/reflect/src/reflect.ts b/packages/reflect/src/reflect.ts
@@ -52,7 +52,7 @@ function traverseObject(fn: any, name: string, ctx: TraverseContext): Reflection
         if (ctx.path.some(x => x === fn)) return
         return reflectObject(fn, name, { path: ctx.path.concat(fn) })
     }
-    if (typeof fn === "function" && reflection.isConstructor(fn))
+    if ((typeof fn === "function" && reflection.isConstructor(fn)))
         return reflectClass(fn)
     if (typeof fn === "function")
         return parseFunction(fn)
@@ -69,7 +69,7 @@ function reflectModuleOrClass(opt: string | Class | Function) {
     if (typeof opt === "string") {
         return reflectObject(require(opt), "module", { path: [] })
     }
-    if (reflection.isConstructor(opt))
+    if (reflection.isConstructor(opt) ||  reflection.isPrimitive(opt))
         return reflectClass(opt as Class)
     if (typeof opt === "function")
         return parseFunction(opt)

diff --git a/tests/behavior/export/__snapshots__/export.spec.ts.snap b/tests/behavior/export/__snapshots__/export.spec.ts.snap
@@ -452,6 +452,7 @@ Object {
     "isConstructor": isConstructor,
     "isCustomClass": isCustomClass,
     "isParameterProperties": isParameterProperties,
+    "isPrimitive": isPrimitive,
   },
   "type": type,
   "useCache": useCache,

diff --git a/tests/behavior/reflect/__snapshots__/class.spec.ts.snap b/tests/behavior/reflect/__snapshots__/class.spec.ts.snap
@@ -401,7 +401,7 @@ Object {
         },
       ],
       "returnType": Promise,
-      "typeClassification": "Class",
+      "typeClassification": "Primitive",
     },
   ],
   "name": "DummyClass",

diff --git a/tests/behavior/reflect/__snapshots__/decorators.spec.ts.snap b/tests/behavior/reflect/__snapshots__/decorators.spec.ts.snap
@@ -2880,7 +2880,7 @@ Object {
       "name": "myMethod",
       "parameters": Array [],
       "returnType": Promise,
-      "typeClassification": "Class",
+      "typeClassification": "Primitive",
     },
   ],
   "name": "MyClass",

diff --git a/tests/behavior/reflect/primitve.spec.ts b/tests/behavior/reflect/primitve.spec.ts
@@ -6,30 +6,37 @@ THIS TEST REQUIRED  NODE.JS 10
 describe("Primitive Class", () => {
     it("Should inspect Boolean", () => {
         const meta = reflect(Boolean)
+        expect(meta.kind).toBe("Class")
         expect(meta.name).toBe("Boolean")
     })
     it("Should inspect String", () => {
         const meta = reflect(String)
+        expect(meta.kind).toBe("Class")
         expect(meta.name).toBe("String")
     })
     it("Should inspect Number", () => {
         const meta = reflect(Number)
+        expect(meta.kind).toBe("Class")
         expect(meta.name).toBe("Number")
     })
     it("Should inspect Date", () => {
         const meta = reflect(Date)
+        expect(meta.kind).toBe("Class")
         expect(meta.name).toBe("Date")
     })
     it("Should inspect Array", () => {
         const meta = reflect(Array)
+        expect(meta.kind).toBe("Class")
         expect(meta.name).toBe("Array")
     })
     it("Should inspect Promise", () => {
         const meta = reflect(Promise)
+        expect(meta.kind).toBe("Class")
         expect(meta.name).toBe("Promise")
     })
     it("Should inspect Object", () => {
         const meta = reflect(Object)
+        expect(meta.kind).toBe("Class")
         expect(meta.name).toBe("Object")
     })
 })