Merge pull request #50 from rnpm/feature/shared-libraries-struct

Alexey · Alexey · commit 54ad25beef5c · 2016-03-29T11:12:02.000+02:00
Fixes #21
diff --git a/src/flatMap.js b/src/flatMap.js
@@ -0,0 +1,6 @@
+module.exports = function flatMap(arr, mapper) {
+  return arr.reduce(
+    (acc, item) => acc.concat(mapper(item)),
+    []
+  );
+};
diff --git a/src/getDependencyConfig.js b/src/getDependencyConfig.js
@@ -0,0 +1,16 @@
+/**
+ * Given an array of dependencies - it returns their RNPM config
+ * if they were valid.
+ */
+module.exports = function getDependencyConfig(config, deps) {
+  return deps.reduce((acc, name) => {
+    try {
+      return acc.concat({
+        config: config.getDependencyConfig(name),
+        name,
+      });
+    } catch (err) {
+      return acc;
+    }
+  }, []);
+};
diff --git a/src/ios/addSharedLibraries.js b/src/ios/addSharedLibraries.js
@@ -0,0 +1,3 @@
+module.exports = function addSharedLibraries(project, libraries) {
+
+};
diff --git a/src/ios/registerNativeModule.js b/src/ios/registerNativeModule.js
@@ -11,6 +11,7 @@ const createGroup = require('./createGroup');
 const hasLibraryImported = require('./hasLibraryImported');
 const addFileToProject = require('./addFileToProject');
 const addProjectToLibraries = require('./addProjectToLibraries');
+const addSharedLibraries = require('./addSharedLibraries');
 const isEmpty = require('../isEmpty');
 
 /**
@@ -52,6 +53,8 @@ module.exports = function registerNativeModuleIOS(dependencyConfig, projectConfi
     });
   });
 
+  addSharedLibraries(project, dependencyConfig.sharedLibraries);
+
   const headers = getHeadersInFolder(dependencyConfig.folder);
   if (!isEmpty(headers)) {
     addToHeaderSearchPaths(
diff --git a/src/ios/removeSharedLibraries.js b/src/ios/removeSharedLibraries.js
@@ -0,0 +1,3 @@
+module.exports = function removeSharedLibraries(project, libraries) {
+
+};
diff --git a/src/ios/unregisterNativeModule.js b/src/ios/unregisterNativeModule.js
@@ -11,6 +11,7 @@ const removeFileFromProject = require('./removeFileFromProject');
 const removeProjectFromLibraries = require('./removeProjectFromLibraries');
 const removeFromStaticLibraries = require('./removeFromStaticLibraries');
 const removeFromHeaderSearchPaths = require('./removeFromHeaderSearchPaths');
+const removeSharedLibraries = require('./addSharedLibraries');
 
 /**
  * Unregister native module IOS
@@ -39,6 +40,8 @@ module.exports = function unregisterNativeModule(dependencyConfig, projectConfig
     });
   });
 
+  removeSharedLibraries(project, dependencyConfig.sharedLibraries);
+
   const headers = getHeadersInFolder(dependencyConfig.folder);
   if (!isEmpty(headers)) {
     removeFromHeaderSearchPaths(
diff --git a/src/link.js b/src/link.js
@@ -7,6 +7,7 @@ const registerDependencyIOS = require('./ios/registerNativeModule');
 const copyAssetsAndroid = require('./android/copyAssets');
 const copyAssetsIOS = require('./ios/copyAssets');
 const getProjectDependencies = require('./getProjectDependencies');
+const getDependencyConfig = require('./getDependencyConfig');
 const dedupeAssets = require('./dedupeAssets');
 
 log.heading = 'rnpm-link';
@@ -81,22 +82,10 @@ module.exports = function link(config, args) {
 
   const packageName = args[0];
 
-  const dependencies =
-    (packageName ? [packageName] : getProjectDependencies())
-    .map(name => {
-      try {
-        return {
-          config: config.getDependencyConfig(name),
-          name,
-        };
-      } catch (err) {
-        log.warn(
-          'ERRINVALIDPROJ',
-          `Project ${name} is not a react-native library`
-        );
-      }
-    })
-    .filter(dependency => dependency);
+  const dependencies = getDependencyConfig(
+    config,
+    packageName ? [packageName] : getProjectDependencies()
+  );
 
   const tasks = Promise.all(dependencies.map(dependency => {
     const pre = promisify(dependency.config.commands.prelink || commandStub);
diff --git a/src/unlink.js b/src/unlink.js
@@ -2,10 +2,14 @@ const path = require('path');
 const log = require('npmlog');
 
 const isEmpty = require('./isEmpty');
+const getProjectDependencies = require('./getProjectDependencies');
 const unregisterDependencyAndroid = require('./android/unregisterNativeModule');
 const unregisterDependencyIOS = require('./ios/unregisterNativeModule');
 const unlinkAssetsAndroid = require('./android/unlinkAssets');
 const unlinkAssetsIOS = require('./ios/unlinkAssets');
+const getDependencyConfig = require('./getDependencyConfig');
+const diff = require('./diff');
+const flatMap = require('./flatMap');
 
 log.heading = 'rnpm-link';
 
@@ -32,9 +36,11 @@ module.exports = function unlink(config, args) {
       'ERRINVALIDPROJ',
       `Project ${packageName} is not a react-native library`
     );
-    process.exit(1);
+    return Promise.reject(err);
   }
 
+  const allDependencies = getDependencyConfig(config, getProjectDependencies());
+
   if (project.android && dependency.android) {
     log.info(`Unlinking ${packageName} android dependency`);
 
@@ -63,7 +69,7 @@ module.exports = function unlink(config, args) {
     }
   }
 
-  const assets = dependency.assets;
+  const assets = diff(dependency.assets, flatMap(allDependencies, d => d.assets));
 
   if (isEmpty(assets)) {
     return Promise.resolve();
diff --git a/test/flatMap.spec.js b/test/flatMap.spec.js
@@ -0,0 +1,13 @@
+const chai = require('chai');
+const expect = chai.expect;
+const flatMap = require('../src/flatMap');
+
+describe('flatMap', () => {
+
+  it('should return flattened array', () => {
+    const items = [{ assets: ['FontA.ttf'] }, { assets: ['FontB.ttf'] }];
+
+    expect(flatMap(items, item => item.assets)).to.deep.equals(['FontA.ttf', 'FontB.ttf']);
+  });
+
+});
diff --git a/test/getDependencyConfig.spec.js b/test/getDependencyConfig.spec.js
@@ -0,0 +1,23 @@
+const chai = require('chai');
+const expect = chai.expect;
+const getDependencyConfig = require('../src/getDependencyConfig');
+const sinon = require('sinon');
+
+describe('getDependencyConfig', () => {
+  it('should return an array of dependencies\' rnpm config', () => {
+    const config = {
+      getDependencyConfig: sinon.stub(),
+    };
+
+    expect(getDependencyConfig(config, ['abcd'])).to.be.an.array;
+    expect(config.getDependencyConfig.callCount).to.equals(1);
+  });
+
+  it('should filter out invalid react-native projects', () => {
+    const config = {
+      getDependencyConfig: sinon.stub().throws(new Error('Cannot require')),
+    };
+
+    expect(getDependencyConfig(config, ['abcd'])).to.deep.equal([]);
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = function addSharedLibraries(project, libraries) {`
	`2`	`+`
	`3`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = function removeSharedLibraries(project, libraries) {`
	`2`	`+`
	`3`	`+};`