[fix] should not have unset resources

fabrix-app · Jun 28, 2018 · 29d9fcd · 29d9fcd
1 parent 1010b18
commit 29d9fcd
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 24 deletions.
diff --git a/lib/Configuration.ts b/lib/Configuration.ts
@@ -61,7 +61,7 @@ export class Configuration extends Map<any, any> {
     }
   }
 
-  static initialResources (tree, resources = ['controllers', 'policies', 'services', 'models', 'resolvers']) {
+  static initialResources (tree, resources = []) {
     if (tree.hasOwnProperty('main') && tree.main.hasOwnProperty('resources')) {
       if (!isArray(tree.main['resources'])) {
         throw new ConfigValueError('if set, main.resources must be an array')

diff --git a/lib/Fabrix.ts b/lib/Fabrix.ts
@@ -1,4 +1,5 @@
 import { EventEmitter } from 'events'
+import { union } from 'lodash'
 import { Core } from './Core'
 import { Configuration } from './Configuration'
 import { LoggerProxy } from './LoggerProxy'
@@ -94,7 +95,7 @@ export class FabrixApp extends EventEmitter {
     this.setMaxListeners(this.config.get('main.maxListeners'))
 
     // Set the resources from the configuration
-    this.resources = this.config.get('main.resources')
+    this.resources = union(Object.keys(app.api), this.config.get('main.resources'))
 
     // Set each api resource to make sure it's provided as an object in app
     this.resources.forEach(resource => {

diff --git a/lib/Templates.ts b/lib/Templates.ts
@@ -48,7 +48,7 @@ export const Templates = {
 
       return (
         ` API
-          Resources         : ${app.resources || []}
+          API Resources     : ${resources ? app.resources : 'NONE INSTALLED'}
           ${ resources }
           Spools            : ${Object.keys(app.spools || {})}`
       )

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fabrix/fabrix",
-  "version": "1.0.0-alpha.11",
+  "version": "1.0.0-alpha.12",
   "description": "Strongly Typed Modern Web Application Framework for Node.js",
   "keywords": [
     "framework",

diff --git a/test/integration/fabrixapp.test.js b/test/integration/fabrixapp.test.js
@@ -219,18 +219,18 @@ describe('Fabrix', () => {
           }
           const app = new FabrixApp(def)
           assert.deepEqual(app.config.get('main.resources'), [
-            'controllers',
-            'policies',
-            'services',
-            'models',
-            'resolvers'
+            // 'controllers',
+            // 'policies',
+            // 'services',
+            // 'models',
+            // 'resolvers'
           ])
 
-          assert(app['controllers'])
-          assert(app['services'])
-          assert(app['models'])
-          assert(app['resolvers'])
-          assert(app['policies'])
+          // assert(app['controllers'])
+          // assert(app['services'])
+          // assert(app['models'])
+          // assert(app['resolvers'])
+          // assert(app['policies'])
         })
 
         it('should override default resources', () => {
@@ -267,19 +267,19 @@ describe('Fabrix', () => {
           }
           const app = new FabrixApp(def)
           assert.deepEqual(app.config.get('main.resources'), [
-            'controllers',
-            'policies',
-            'services',
-            'models',
-            'resolvers',
+            // 'controllers',
+            // 'policies',
+            // 'services',
+            // 'models',
+            // 'resolvers',
             'events',
             'customKey'
           ])
-          assert(app['controllers'])
-          assert(app['events'])
-          assert(app['models'])
-          assert(app['services'])
-          assert(app['resolvers'])
+          // assert(app['controllers'])
+          // assert(app['events'])
+          // assert(app['models'])
+          // assert(app['services'])
+          // assert(app['resolvers'])
           assert(app['events'])
           assert(app['customKey'])
         })