Migration to TS2.0 (#6)

* Change matching logic to ensure no null tokens
* configure travis to use node version 6+
* use latest 'include' config and git ignore the temp 'tsconfig' files
* add 'noImplicitThis' to tsconfig
* migrate for 'strictNullChecks'
* Configure for TS2.0

Fixes #5
Merges #6

.gitignore

@@ -10,5 +10,6 @@
 /typings
 .baseDir.ts
 .tscache
+.tsconfig*.json
 coverage-unmapped.json
 npm-debug.log

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: node_js
 node_js:
-- '5.1'
+- '6'
 env:
   global:
   - SAUCE_USERNAME: dojo2-ts-ci

package.json

@@ -42,6 +42,6 @@
     "remap-istanbul": "^0.6.4",
     "sinon": "^1.17.4",
     "tslint": "^3.11.0",
-    "typescript": "^1.8.10"
+    "typescript": "beta"
   }
 }

src/has.ts

@@ -3,7 +3,7 @@ import { Require, Config } from './loader';
 /**
  * The valid return types from a feature test
  */
-export type FeatureTestResult = boolean | string | number;
+export type FeatureTestResult = boolean | string | number | undefined;
 
 /**
  * A function that tests for a feature and returns a result
@@ -43,11 +43,11 @@ export function load(resourceId: string, require: Require, load: (value?: any) =
  * @param resourceId The id of the module
  * @param normalize Resolves a relative module id into an absolute module id
  */
-export function normalize(resourceId: string, normalize: (moduleId: string) => string): string {
-	const tokens = resourceId.match(/[\?:]|[^:\?]*/g);
+export function normalize(resourceId: string, normalize: (moduleId: string) => string): string | null {
+	const tokens: RegExpMatchArray = resourceId.match(/[\?:]|[^:\?]*/g) || [];
 	let i = 0;
 
-	function get(skip?: boolean): string {
+	function get(skip?: boolean): string | null {
 		const term = tokens[i++];
 		if (term === ':') {
 			// empty string module name, resolves to null
@@ -71,9 +71,9 @@ export function normalize(resourceId: string, normalize: (moduleId: string) => s
 		}
 	}
 
-	resourceId = get();
+	const id = get();
 
-	return resourceId && normalize(resourceId);
+	return id && normalize(id);
 }
 
 /**

tests/intern.ts

@@ -32,7 +32,7 @@ export const maxConcurrency = 2;
 export const tunnel = 'BrowserStackTunnel';
 
 // Support running unit tests from a web server that isn't the intern proxy
-export const initialBaseUrl: string = (function () {
+export const initialBaseUrl: string | null = (function () {
 	if (typeof location !== 'undefined' && location.pathname.indexOf('__intern/') > -1) {
 		return '/';
 	}

tests/unit/has.ts

@@ -106,7 +106,7 @@ registerSuite({
 
 		'null test should not throw'() {
 			assert.doesNotThrow(function () {
-				hasAdd('baz', null);
+				hasAdd('baz', <any> null);
 			}, TypeError);
 		},
 
@@ -164,7 +164,7 @@ registerSuite({
 		},
 
 		'null test value counts as being defined'() {
-			hasAdd(feature, null);
+			hasAdd(feature, <any> null);
 			assert.isTrue(hasExists(feature));
 		}
 	},
@@ -251,7 +251,7 @@ registerSuite({
 			const requireSpy = sinon.spy(require);
 			const loadedStub = sinon.stub();
 
-			hasLoad(null, require, loadedStub);
+			hasLoad(<any> null, require, loadedStub);
 			assert.isTrue(loadedStub.calledOnce);
 			assert.isFalse(requireSpy.calledOnce);
 		}

tsconfig.json

@@ -1,5 +1,5 @@
 {
-	"version": "1.8.10",
+	"version": "2.0.0",
 	"compilerOptions": {
 		"declaration": false,
 		"module": "umd",
@@ -8,26 +8,13 @@
 		"removeComments": false,
 		"sourceMap": true,
 		"target": "es5",
-		"moduleResolution": "classic"
+		"moduleResolution": "classic",
+		"strictNullChecks": true,
+		"noImplicitThis": true
 	},
-	"filesGlob": [
+	"include": [
 		"./typings/index.d.ts",
 		"./src/**/*.ts",
 		"./tests/**/*.ts"
-	],
-	"files": [
-		"./typings/index.d.ts",
-		"./src/has.ts",
-		"./src/loader.d.ts",
-		"./src/main.ts",
-		"./tests/functional/all.ts",
-		"./tests/intern-local.ts",
-		"./tests/intern-saucelabs.ts",
-		"./tests/intern.ts",
-		"./tests/support/Reporter.ts",
-		"./tests/support/util.ts",
-		"./tests/unit/all.ts",
-		"./tests/unit/has.ts",
-		"./tests/unit/main.ts"
 	]
 }