Merge pull request #216 from shlomiassaf/fix/importClassesFromDirecto…

…ries fix logic for loading classes from modules
typestack · Jul 18, 2017 · 2765a22 · 2765a22
2 parents bdeb297 + 0ffb61c
commit 2765a22
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/util/importClassesFromDirectories.ts b/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;