fix(util-roles): fix resources export

also make the enrichResources not modify the passed object
botpress · Jun 7, 2018 · 22a4732 · 22a4732
1 parent ecdb35a
commit 22a4732
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/packages/core/botpress-util-roles/package.json b/packages/core/botpress-util-roles/package.json
@@ -8,6 +8,8 @@
   "private": false,
   "devDependencies": {
     "babel-cli": "^6.26.0",
+    "babel-plugin-transform-export-extensions": "^6.22.0",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "^1.6.1",
     "jest": "^22.4.3",
     "rimraf": "^2.6.2"

diff --git a/packages/core/botpress-util-roles/src/index.test.js b/packages/core/botpress-util-roles/src/index.test.js
@@ -137,7 +137,6 @@ test('enrichResources', () => {
     }
   ]
 
-  enrichResources(resources)
-
-  expect(resources).toEqual(enrichedResources)
+  expect(enrichResources(resources)).not.toBe(resources)
+  expect(enrichResources(resources)).toEqual(enrichedResources)
 })
diff --git a/packages/core/botpress-util-roles/src/resources.js b/packages/core/botpress-util-roles/src/resources.js
@@ -5,12 +5,14 @@ const _enrichResources = (resources, parent) => {
   if (!resources) {
     return
   }
-  resources.forEach(r => {
-    Object.assign(r, {
+  return resources.map(r => {
+    const fullName = parent != null ? `${parent}.${r.name}` : r.name
+    return {
+      ...r,
       displayName: r.name,
-      name: parent != null ? `${parent}.${r.name}` : r.name
-    })
-    _enrichResources(r.children, r.name)
+      name: fullName,
+      children: _enrichResources(r.children, fullName)
+    }
   })
 }
 

diff --git a/packages/core/botpress-util-roles/yarn.lock b/packages/core/botpress-util-roles/yarn.lock
@@ -420,7 +420,11 @@ babel-plugin-syntax-exponentiation-operator@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
 
-babel-plugin-syntax-object-rest-spread@^6.13.0:
+babel-plugin-syntax-export-extensions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz#70a1484f0f9089a4e84ad44bac353c95b9b12721"
+
+babel-plugin-syntax-object-rest-spread@^6.13.0, babel-plugin-syntax-object-rest-spread@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
 
@@ -612,6 +616,20 @@ babel-plugin-transform-exponentiation-operator@^6.22.0:
     babel-plugin-syntax-exponentiation-operator "^6.8.0"
     babel-runtime "^6.22.0"
 
+babel-plugin-transform-export-extensions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz#53738b47e75e8218589eea946cbbd39109bbe653"
+  dependencies:
+    babel-plugin-syntax-export-extensions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-object-rest-spread@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.8.0"
+    babel-runtime "^6.26.0"
+
 babel-plugin-transform-regenerator@^6.22.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"