feat(dtsm): remove reference from bundle when uninstall definitions

Merge branch 'ukyo-uninstall-and-remove-reference-path'
vvakame · Apr 30, 2016 · 4d0a151 · 4d0a151
2 parents a0fe795 + 7733e8e
commit 4d0a151
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/lib/manager.ts b/lib/manager.ts
@@ -467,6 +467,12 @@ export default class Manager {
                             let unused = result.dependenciesList.every(exDep => exDep.depName !== dep.depName);
                             if (unused) {
                                 this._removeDefinitionFile(this.savedRecipe, dep);
+
+                                if (!this.savedRecipe.bundle) {
+                                    return;
+                                }
+                                let depPath = _path.join(_path.dirname(this.configPath), this.path, dep.depName);
+                                this._removeReferenceFromBundle(this.savedRecipe, depPath);
                             }
                         });
 
@@ -589,6 +595,14 @@ export default class Manager {
         }
     }
 
+    _createReferenceComment(bundlePath: string, pathFromCwd: string) {
+        let referencePath = _path.relative(_path.dirname(bundlePath), pathFromCwd);
+        if (_path.posix) { // for windows
+            referencePath = referencePath.replace(new RegExp("\\" + _path.win32.sep, "g"), _path.posix.sep);
+        }
+        return `/// <reference path="${referencePath}" />` + "\n";
+    }
+
     _addReferenceToBundle(recipe: m.Recipe, pathFromCwd: string) {
         let bundleContent = "";
         let bundlePath = _path.join(_path.dirname(this.configPath), recipe.bundle);
@@ -597,16 +611,25 @@ export default class Manager {
         } else {
             mkdirp.sync(_path.dirname(bundlePath));
         }
-        let referencePath = _path.relative(_path.dirname(bundlePath), pathFromCwd);
-        if (_path.posix) { // for windows
-            referencePath = referencePath.replace(new RegExp("\\" + _path.win32.sep, "g"), _path.posix.sep);
-        }
-        let referenceComment = `/// <reference path="${referencePath}" />` + "\n";
+        let referenceComment = this._createReferenceComment(bundlePath, pathFromCwd);
         if (bundleContent.indexOf(referenceComment) === -1) {
             fs.appendFileSync(bundlePath, referenceComment, { encoding: "utf8" });
         }
     }
 
+    _removeReferenceFromBundle(recipe: m.Recipe, pathFromCwd: string) {
+        let bundleContent = "";
+        let bundlePath = _path.join(_path.dirname(this.configPath), recipe.bundle);
+        if (!fs.existsSync(bundlePath)) {
+            return;
+        }
+        bundleContent = fs.readFileSync(bundlePath, "utf8");
+        let referenceComment = this._createReferenceComment(bundlePath, pathFromCwd);
+        if (bundleContent.indexOf(referenceComment) !== -1) {
+            fs.writeFileSync(bundlePath, bundleContent.replace(referenceComment, ''), { encoding: "utf8" });
+        }
+    }
+
     refs(): Promise<fsgit.RefInfo[]> {
         let promises: Promise<any>[];
         if (this.offline) {

diff --git a/test/cliSpec.ts b/test/cliSpec.ts
@@ -290,6 +290,7 @@ describe("command line interface", () => {
 
         it("can uninstall definition files", () => {
             var targetFile = path.resolve(testWorkingDir, "dtsm.json");
+            var bundleFile = path.resolve(testWorkingDir, "typings/bundle.d.ts");
 
             assert(!fs.existsSync(targetFile));
             return Promise.resolve(null)
@@ -322,6 +323,8 @@ describe("command line interface", () => {
                                 assert(exit === 0);
                                 assert(fs.existsSync(targetFile));
                                 assert(fs.existsSync(path.resolve(testWorkingDir, "typings/es6-promise/es6-promise.d.ts")));
+                                assert(fs.existsSync(bundleFile));
+                                assert(fs.readFileSync(bundleFile).indexOf('/// <reference path="es6-promise/es6-promise.d.ts" />') !== -1);
                                 resolve();
                             });
                     });
@@ -339,6 +342,8 @@ describe("command line interface", () => {
                                 assert(exit === 0);
                                 assert(fs.existsSync(targetFile));
                                 assert(!fs.existsSync(path.resolve(testWorkingDir + "typings/es6-promise/es6-promise.d.ts")));
+                                assert(fs.existsSync(bundleFile));
+                                assert(fs.readFileSync(bundleFile).indexOf('/// <reference path="es6-promise/es6-promise.d.ts" />') === -1);
                                 resolve();
                             });
                     });