Merge pull request #216 from shlomiassaf/fix/importClassesFromDirectories

fix logic for loading classes from modules

Author: pleerock

src/util/importClassesFromDirectories.ts

@@ -8,12 +8,10 @@ export function importClassesFromDirectories(directories: string[], formats = ["
     const loadFileClasses = function (exported: any, allLoaded: Function[]) {
         if (exported instanceof Function) {
             allLoaded.push(exported);
-
-        } else if (exported instanceof Object) {
-            Object.keys(exported).forEach(key => loadFileClasses(exported[key], allLoaded));
-
         } else if (exported instanceof Array) {
             exported.forEach((i: any) => loadFileClasses(i, allLoaded));
+        } else if (exported instanceof Object || typeof exported === 'object') {
+            Object.keys(exported).forEach(key => loadFileClasses(exported[key], allLoaded));
         }
 
         return allLoaded;