Fixed a bug

mokkabonna · Oct 16, 2017 · cc84550 · cc84550
1 parent 945e537
commit cc84550
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/src/index.js b/src/index.js
@@ -116,23 +116,14 @@ var mixin = {
         var self = this
         return reduce(normalizedSchemas, function(all, schema) {
           var root = self
-          var data = createDataProperties(normalizedSchemas)
-          var flatStructure = isPlainObject(data) ? flattenObject(data) : {}
+
           if (schemaConfig.mountPoint !== '.' && !originallyArray) {
-            data = get(self, schemaConfig.mountPoint)
-            flatStructure = isPlainObject(data) ? flattenObject(data) : {}
-            root = get(self, schemaConfig.mountPoint)
-
-            if (isPlainObject(root)) {
-              flatStructure = reduce(flatStructure, function(all, val, key) {
-                all[String(key).replace(schemaConfig.mountPoint, '').replace(/^\./, '')] = val
-                return all
-              }, {})
-            } else {
-              return root
-            }
+            return get(self, schemaConfig.mountPoint)
           }
 
+          var data = createDataProperties(normalizedSchemas)
+          var flatStructure = isPlainObject(data) ? flattenObject(data) : {}
+
           return reduce(flatStructure, function(all, val, path) {
             return set(all, path, get(root, path))
           }, all)

diff --git a/test/specs/schemas.spec.js b/test/specs/schemas.spec.js
@@ -41,8 +41,8 @@ describe('schema fixtures validation', function() {
       return Promise.all(innerSchema.map(function(config) {
         if (_.isPlainObject(config.schema)) {
           return $RefParser.dereference(config.schema).then(function(dereferenced) {
-            innerSchema.schema = dereferenced
-            return innerSchema
+            config.schema = dereferenced
+            return config
           })
         } else {
           innerSchema.schema = config.schema