Merge pull request #210 from Diullei/master

fix: #216 #193

Author: Diullei

package.json

@@ -108,7 +108,7 @@
     "source-map-support": "~0.2.6",
     "time-grunt": "^1.0.0",
     "tslint-path-formatter": "~0.1.1",
-    "typescript": "^1.1.0-1",
+    "typescript": "1.5.3",
     "dir-compare": "^0.0.2"
   }
 }

src/tsd/API.ts

@@ -220,9 +220,12 @@ class API {
 		var linker = new PackageLinker();
 		var manager = new BundleManager(this.core.context.getTypingsDir());
 
+		var bundlePath = path.join(path.dirname(this.core.context.paths.configFile), this.core.context.config.toJSON().bundle);
+
 		return linker.scanDefinitions(baseDir).then((packages) => {
 			return Promise.reduce(packages, (memo: PackageDefinition[], packaged) => {
-				return manager.addToBundle(this.context.config.bundle, packaged.definitions, true).then((change) => {
+
+				return manager.addToBundle(bundlePath, packaged.definitions, true).then((change) => {
 					if (change.someAdded()) {
 						memo.push(packaged);
 					}

src/tsd/data/Def.ts

@@ -10,7 +10,7 @@ import objectUtils = require('../../xm/objectUtils');
 
 import DefVersion = require('./DefVersion');
 
-var defExp = /^[a-z](?:[\._-]?[a-z0-9])*(?:\/[a-z](?:[\._-]?[a-z0-9])*)+\.d\.ts$/i;
+var defExp = /^[a-z_](?:[\._-]?[a-z0-9_])*(?:\/[a-z_](?:[\._-]?[a-z0-9_])*)+\.d\.ts$/i;
 
 var versionEnd = /(?:-v?)(\d+(?:\.\d+)*)(-[a-z](?:[_-]?[a-z0-9])*(?:\.\d+)*)?$/i;
 var twoNums = /^\d+\.\d+$/;

src/tsd/data/DefIndex.ts

@@ -89,9 +89,9 @@ class DefIndex {
 
 		var releases: Def[] = [];
 
-		Lazy(<Object>tree.tree).each((elem: GithubJSONTreeElem) => {
+		(<any>Lazy(<Object>tree.tree)).each((elem: GithubJSONTreeElem) => {
 			var char = elem.path.charAt(0);
-			if (elem.type === 'blob' && char !== '.' && char !== '_' && Def.isDefPath(elem.path)) {
+			if (elem.type === 'blob' && char !== '.' && Def.isDefPath(elem.path)) {
 				def = this.procureDef(elem.path);
 				if (!def) {
 					return;
@@ -135,7 +135,7 @@ class DefIndex {
 		def.history = [];
 
 		// TODO harden data validation
-		Lazy(commitJsonArray).each((json) => {
+		(<any>Lazy(commitJsonArray)).each((json) => {
 			if (!json || !json.sha) {
 				console.dir(json, 'weird: json no sha', 1);
 			}

src/tsd/schema/config.ts

@@ -42,7 +42,7 @@ var schema = Joi.object({
 		.description('toggle stats tracking'),
 	installed: Joi
 		.object()
-		.pattern(/^([a-z](?:[\._-]?[a-z0-9]+)*)(\/[a-z](?:[\._-]?[a-z0-9]+)*)+\.d\.ts$/i, Joi.object({
+		.pattern(/^([a-z_](?:[\._-]?[a-z0-9_]+)*)(\/[a-z_](?:[\._-]?[a-z0-9_]+)*)+\.d\.ts$/i, Joi.object({
 			commit: Joi.string()
 				.required()
 				.regex(/^[0-9a-f]{6,40}$/)

src/tsd/support/Bundle.ts

@@ -145,7 +145,7 @@ class Bundle {
 
 	toArray(relative: boolean = false, canonical: boolean = false): string[] {
 		var base = (relative ? path.dirname(this.target) : null);
-		return Lazy(this.lines)
+		return (<any>Lazy(this.lines))
 			.filter(line => !!line.ref)
 			.map(line => line.getRef(base, canonical))
 			.toArray();

src/tsd/support/BundleManager.ts

@@ -26,6 +26,7 @@ class BundleManager {
 	addToBundle(target: string, refs: string[], save: boolean): Promise<BundleChange> {
 		return this.readBundle(target, true).then((bundle: Bundle) => {
 			var change = new BundleChange(bundle);
+
 			refs.forEach((ref) => {
 				change.add(bundle.append(ref));
 			});
@@ -89,7 +90,7 @@ class BundleManager {
 		target = path.resolve(target);
 
 		return this.cleanupBundle(target, false).then((change) => {
-			return fileIO.glob('*/*.d.ts', {
+			return fileIO.glob('*/*.d.ts', <any>{
 				cwd: change.bundle.baseDir
 			}).then((paths) => {
 				paths.forEach((def) => {

test/nspec/cases/install-_debugger/command.txt

@@ -0,0 +1 @@
+install _debugger --save -c 5937bd

test/nspec/cases/install-_debugger/expected/out.txt

@@ -0,0 +1,13 @@
+
+ - _debugger / _debugger : 5937bd : 2015-07-22 00:07
+   -> node   > node                 
+      
+   5937bd | 2015-07-22 00:07 | basarat @ basarat   
+    | feat(node) _debugger API   
+
+>> running install..
+
+>> written 2 files:
+
+    - _debugger/_debugger.d.ts
+    - node/node.d.ts

test/nspec/cases/install-_debugger/expected/tsd.json

@@ -0,0 +1,15 @@
+{
+  "version": "v4",
+  "repo": "borisyankov/DefinitelyTyped",
+  "ref": "master",
+  "path": "typings",
+  "bundle": "typings/tsd.d.ts",
+  "installed": {
+    "_debugger/_debugger.d.ts": {
+      "commit": "5937bdd91a0f45a6d4c2f8a5692990fbce573764"
+    },
+    "node/node.d.ts": {
+      "commit": "273a567b0a0bcc34cbf2a2470b2febc95796b644"
+    }
+  }
+}