Update unlink interface (#79)

grabbou · grabbou · commit fa1d6a7e2822 · 2016-05-03T12:59:18.000+02:00
* Initial commit

* Fix errors

* Resolve

* Fixes
diff --git a/src/android/registerNativeModule.js b/src/android/registerNativeModule.js
@@ -35,6 +35,4 @@ module.exports = function registerNativeAndroidModule(
     projectConfig.mainActivityPath,
     makeImportPatch(androidConfig.packageImportPath)
   );
-
-  return true;
 };
diff --git a/src/android/unregisterNativeModule.js b/src/android/unregisterNativeModule.js
@@ -44,6 +44,4 @@ module.exports = function unregisterNativeAndroidModule(
     projectConfig.mainActivityPath,
     makeImportPatch(androidConfig.packageImportPath)
   );
-
-  return true;
 };
diff --git a/src/ios/unregisterNativeModule.js b/src/ios/unregisterNativeModule.js
@@ -6,7 +6,6 @@ const getProducts = require('./getProducts');
 const getHeadersInFolder = require('./getHeadersInFolder');
 const isEmpty = require('lodash').isEmpty;
 const getHeaderSearchPath = require('./getHeaderSearchPath');
-const hasLibraryImported = require('./hasLibraryImported');
 const removeProjectFromProject = require('./removeProjectFromProject');
 const removeProjectFromLibraries = require('./removeProjectFromLibraries');
 const removeFromStaticLibraries = require('./removeFromStaticLibraries');
@@ -24,9 +23,6 @@ module.exports = function unregisterNativeModule(dependencyConfig, projectConfig
   const dependencyProject = xcode.project(dependencyConfig.pbxprojPath).parseSync();
 
   const libraries = getGroup(project, projectConfig.libraryFolder);
-  if (!libraries || !hasLibraryImported(libraries, dependencyConfig.projectName)) {
-    return false;
-  }
 
   const file = removeProjectFromProject(
     project,
@@ -55,6 +51,4 @@ module.exports = function unregisterNativeModule(dependencyConfig, projectConfig
     projectConfig.pbxprojPath,
     project.writeSync()
   );
-
-  return true;
 };
diff --git a/src/unlink.js b/src/unlink.js
@@ -4,6 +4,8 @@ const log = require('npmlog');
 const getProjectDependencies = require('./getProjectDependencies');
 const unregisterDependencyAndroid = require('./android/unregisterNativeModule');
 const unregisterDependencyIOS = require('./ios/unregisterNativeModule');
+const isInstalledAndroid = require('./android/isInstalled');
+const isInstalledIOS = require('./ios/isInstalled');
 const unlinkAssetsAndroid = require('./android/unlinkAssets');
 const unlinkAssetsIOS = require('./ios/unlinkAssets');
 const getDependencyConfig = require('./getDependencyConfig');
@@ -13,14 +15,58 @@ const flatten = require('lodash').flatten;
 
 log.heading = 'rnpm-link';
 
+const unlinkDependencyAndroid = (androidProject, dependency, packageName) => {
+  if (!androidProject || !dependency.android) {
+    return;
+  }
+
+  const isInstalled = isInstalledAndroid(androidProject, packageName);
+
+  if (!isInstalled) {
+    log.info(`Android module ${packageName} is not installed`);
+    return;
+  }
+
+  log.info(`Unlinking ${packageName} android dependency`);
+
+  unregisterDependencyAndroid(packageName, dependency.android, androidProject);
+
+  log.info(`Android module ${packageName} has been successfully unlinked`);
+};
+
+const unlinkDependencyIOS = (iOSProject, dependency, packageName) => {
+  if (!iOSProject || !dependency.ios) {
+    return;
+  }
+
+  const isInstalled = isInstalledIOS(iOSProject, dependency.ios);
+
+  if (!isInstalled) {
+    log.info(`iOS module ${packageName} is not installed`);
+    return;
+  }
+
+  log.info(`Unlinking ${packageName} ios dependency`);
+
+  unregisterDependencyIOS(dependency.ios, iOSProject);
+
+  log.info(`iOS module ${packageName} has been successfully unlinked`);
+};
+
 /**
  * Updates project and unlink specific dependency
  *
- * If optional argument [packageName] is provided, it's the only one that's checked
+ * If optional argument [packageName] is provided, it's the only one
+ * that's checked
  */
 module.exports = function unlink(config, args) {
+  const packageName = args[0];
+
+  var project;
+  var dependency;
+
   try {
-    const project = config.getProjectConfig();
+    project = config.getProjectConfig();
   } catch (err) {
     log.error(
       'ERRPACKAGEJSON',
@@ -29,10 +75,8 @@ module.exports = function unlink(config, args) {
     return Promise.reject(err);
   }
 
-  const packageName = args[0];
-
   try {
-    const dependency = config.getDependencyConfig(packageName);
+    dependency = config.getDependencyConfig(packageName);
   } catch (err) {
     log.warn(
       'ERRINVALIDPROJ',
@@ -41,35 +85,10 @@ module.exports = function unlink(config, args) {
     return Promise.reject(err);
   }
 
-  const allDependencies = getDependencyConfig(config, getProjectDependencies());
-
-  if (project.android && dependency.android) {
-    log.info(`Unlinking ${packageName} android dependency`);
+  unlinkDependencyAndroid(project.android, dependency, packageName);
+  unlinkDependencyIOS(project.ios, dependency, packageName);
 
-    const didUnlinkAndroid = unregisterDependencyAndroid(
-      packageName,
-      dependency.android,
-      project.android
-    );
-
-    if (didUnlinkAndroid) {
-      log.info(`Android module ${packageName} has been successfully unlinked`);
-    } else {
-      log.info(`Android module ${packageName} is not linked yet`);
-    }
-  }
-
-  if (project.ios && dependency.ios) {
-    log.info(`Unlinking ${packageName} ios dependency`);
-
-    const didUnlinkIOS = unregisterDependencyIOS(dependency.ios, project.ios);
-
-    if (didUnlinkIOS) {
-      log.info(`iOS module ${packageName} has been successfully unlinked`);
-    } else {
-      log.info(`iOS module ${packageName} is not linked yet`);
-    }
-  }
+  const allDependencies = getDependencyConfig(config, getProjectDependencies());
 
   const assets = difference(
     dependency.assets,
@@ -90,7 +109,9 @@ module.exports = function unlink(config, args) {
     unlinkAssetsAndroid(assets, project.android.assetsPath);
   }
 
-  log.info(`${packageName} assets has been successfully unlinked from your project`);
+  log.info(
+    `${packageName} assets has been successfully unlinked from your project`
+  );
 
   return Promise.resolve();
 };
